Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/react18/context

2024-07-06 23:43:31 +00:00 · 2023-07-17 12:55:36 +01:00 · 2023-07-17 12:55:36 +01:00 · d5e7cb2bc7
parent 7bb4d91e5c 42afb0199f
commit d5e7cb2bc7
104 changed files with 3141 additions and 2006 deletions
--- a/.github/cfp_headers
+++ b/.github/cfp_headers
@ -1,6 +1,9 @@
 /*
+  ! Access-Control-Allow-Origin
  X-XSS-Protection: 1; mode=block
  X-Content-Type-Options: nosniff
+  X-Frame-Options: SAMEORIGIN
+  Content-Security-Policy: frame-ancestors 'self'
  Strict-Transport-Security: max-age=31536000; includeSubDomains; preload

 /version
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@ -74,10 +74,9 @@ jobs:
              run: |
                  {
                      echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
-                      RESULTS=$(aws s3api --region auto --endpoint-url $R2_URL list-objects-v2 --bucket $R2_BUCKET \
-                          --query "sort_by(Contents[?ends_with(Key, '/bundle.css')], &LastModified)[-100:].Key"
-                          --prefix "bundles/" | jq -r '.[]' | grep -oE '[^\"].*\/\s*')
-                      for bundle in "$RESULTS"; do
+                      aws s3api --region auto --endpoint-url $R2_URL list-objects-v2 --bucket $R2_BUCKET \
+                          --query "sort_by(Contents[?ends_with(Key, '/bundle.css')], &LastModified)[-100:].Key" \
+                          --prefix "bundles/" | jq -r '.[]' | grep -oE '[^\"].*\/\s*' | while read -r path ; do
                          echo "/${path}* $R2_PUBLIC_URL/${path}:splat 301"
                      done
                  } | tee _deploy/_redirects
@ -107,7 +106,7 @@ jobs:

            - name: Deploy to Cloudflare Pages
              id: cfp
-              uses: cloudflare/pages-action@61eafe73baad0195ab582cb447b2c6e15a0df9ce # v1
+              uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca # v1
              with:
                  apiToken: ${{ secrets.CF_PAGES_TOKEN }}
                  accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
--- a/.github/workflows/dockerhub.yaml
+++ b/.github/workflows/dockerhub.yaml
@ -18,22 +18,22 @@ jobs:
                  fetch-depth: 0 # needed for docker-package to be able to calculate the version

            - name: Set up QEMU
-              uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2
+              uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2

            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
+              uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2
              with:
                  install: true

            - name: Login to Docker Hub
-              uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
+              uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
              with:
                  username: ${{ secrets.DOCKERHUB_USERNAME }}
                  password: ${{ secrets.DOCKERHUB_TOKEN }}

            - name: Docker meta
              id: meta
-              uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4
+              uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
              with:
                  images: |
                      vectorim/element-web
@ -44,7 +44,7 @@ jobs:
                      latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}

            - name: Build and push
-              uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
+              uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
              with:
                  context: .
                  push: true
@ -53,7 +53,7 @@ jobs:
                  labels: ${{ steps.meta.outputs.labels }}

            - name: Update repo description
-              uses: peter-evans/dockerhub-description@202973a37c8a723405c0c5f0a71b6d99db470dae # v3
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3
              continue-on-error: true
              with:
                  username: ${{ secrets.DOCKERHUB_USERNAME }}
--- a/.github/workflows/pending-reviews.yaml
+++ b/.github/workflows/pending-reviews.yaml
@ -11,6 +11,7 @@ jobs:
        environment: Matrix
        env:
            URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
+            RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+"
        steps:
            - uses: actions/github-script@v6
              env:
@ -21,6 +22,43 @@ jobs:
                  # PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  script: |
+                      const { HS_URL, ROOM_ID, TOKEN, URL, RELEASE_BLOCKERS_URL } = process.env;
+
+                      async function updateCounter(counter, link, severity, title, value, clearOnZero) {
+                          const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${ROOM_ID}/state/re.jki.counter/${counter}`;
+                          const headers = {
+                              "Content-Type": "application/json",
+                              "Authorization": `Bearer ${TOKEN}`,
+                          };
+                          const res = await fetch(apiUrl, {
+                              method: "GET",
+                              headers,
+                          });
+
+                          const data = await res.json();
+
+                          if (data.value === issueCount) {
+                              console.log("Pending review count already correct");
+                              return;
+                          }
+
+                          let body = {};
+                          if (issueCount || !clearOnZero) {
+                              body = JSON.stringify({
+                                  link,
+                                  severity,
+                                  title,
+                                  value,
+                              });
+                          }
+
+                          await fetch(apiUrl, {
+                              method: "PUT",
+                              body,
+                              headers,
+                          });
+                      }
+
                      const repos = [
                          "vector-im/element-desktop",
                          "vector-im/element-web",
@ -43,32 +81,10 @@ jobs:
                          });
                          issueCount += data.total_count;
                      }
+                      await updateCounter("gh_reviews", URL, "warning", "Pending reviews", issueCount);

-                      const { HS_URL, ROOM_ID, TOKEN, URL } = process.env;
-                      const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${ROOM_ID}/state/re.jki.counter/gh_reviews`;
-                      const headers = {
-                          "Content-Type": "application/json",
-                          "Authorization": `Bearer ${TOKEN}`,
-                      };
-                      const res = await fetch(apiUrl, {
-                          method: "GET",
-                          headers,
-                      });
-
-                      const data = await res.json();
-
-                      if (data.value === issueCount) {
-                          console.log("Pending review count already correct");
-                          return;
-                      }
-
-                      await fetch(apiUrl, {
-                          method: "PUT",
-                          body: JSON.stringify({
-                              "link": URL,
-                              "severity": "warning",
-                              "title": "Pending reviews",
-                              "value": issueCount
-                          }),
-                          headers,
+                      const { data } = await github.rest.search.issuesAndPullRequests({
+                          q: `is:open ${repos.map(repo => `repo:${repo}`).join(" ")} label:X-Release-Blocker`,
                      });
+                      const blockerCount = data.total_count;
+                      await updateCounter("release_blockers", RELEASE_BLOCKERS_URL, "alert", "Release Blockers", blockerCount, true);
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@ -26,44 +26,6 @@ jobs:
            - name: Typecheck
              run: "yarn run lint:types"

-    tsc-strict:
-        name: Typescript Strict Error Checker
-        if: github.event_name == 'pull_request'
-        runs-on: ubuntu-latest
-        permissions:
-            pull-requests: read
-            checks: write
-        steps:
-            - uses: actions/checkout@v3
-
-            - name: Install Deps
-              run: "scripts/layered.sh"
-
-            - name: Get diff lines
-              id: diff
-              uses: Equip-Collaboration/diff-line-numbers@df70b4b83e05105c15f20dc6cc61f1463411b2a6 # v1.0.0
-              with:
-                  include: '["\\.tsx?$"]'
-
-            - name: Detecting files changed
-              id: files
-              uses: futuratrepadeira/changed-files@0239328a3a6268aad16af7c3e4efc78e32d6c0f0 # v4.0.1
-              with:
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  pattern: '^.*\.tsx?$'
-
-            - uses: t3chguy/typescript-check-action@main
-              with:
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  use-check: false
-                  check-fail-mode: added
-                  output-behaviour: annotate
-                  ts-extra-args: "--strict --noImplicitAny"
-                  files-changed: ${{ steps.files.outputs.files_updated }}
-                  files-added: ${{ steps.files.outputs.files_created }}
-                  files-deleted: ${{ steps.files.outputs.files_deleted }}
-                  line-numbers: ${{ steps.diff.outputs.lineNumbers }}
-
    i18n_lint:
        name: "i18n Check"
        uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
--- a/.github/workflows/update-topics.yaml
+++ b/.github/workflows/update-topics.yaml
@ -0,0 +1,95 @@
+name: Update release topics
+on:
+    workflow_dispatch:
+        inputs:
+            expected_status:
+                description: What type of release is the next expected release
+                required: true
+                default: RC
+                type: choice
+                options:
+                    - RC
+                    - Release
+            expected_date:
+                description: Expected release date e.g. July 11th
+                required: true
+                type: string
+concurrency: ${{ github.workflow }}
+jobs:
+    bot:
+        name: Release topic update
+        runs-on: ubuntu-latest
+        environment: Matrix
+        steps:
+            - uses: actions/github-script@v6
+              env:
+                  HS_URL: ${{ secrets.BETABOT_HS_URL }}
+                  LOBBY_ROOM_ID: ${{ secrets.ROOM_ID }}
+                  PUBLIC_ROOM_ID: "!YTvKGNlinIzlkMTVRl:matrix.org"
+                  ANNOUNCEMENT_ROOM_ID: "!bijaLdadorKgNGtHdA:matrix.org"
+                  TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }}
+                  RELEASE_STATUS: "Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}"
+              with:
+                  script: |
+                      const { HS_URL, TOKEN, RELEASE_STATUS, LOBBY_ROOM_ID, PUBLIC_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env;
+
+                      const repo = context.repo;
+                      const { data } = await github.rest.repos.getLatestRelease({
+                          owner: repo.owner,
+                          repo: repo.repo,
+                      });
+                      console.log("Found latest version: " + data.tag_name);
+
+                      const releaseTopic = `Stable: ${data.tag_name} | ${RELEASE_STATUS}`;
+                      console.log("Release topic: " + releaseTopic);
+
+                      const regex = /Stable: v(.+) \| Release status: (\w+) expected (\w+ \d+\w\w)/gm;
+
+                      async function updateReleaseInTopic(roomId) {
+                          const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${roomId}/state/m.room.topic/`;
+                          const headers = {
+                              "Content-Type": "application/json",
+                              "Authorization": `Bearer ${TOKEN}`,
+                          };
+                          await fetch(`${HS_URL}/_matrix/client/v3/rooms/${roomId}/join`, {
+                              method: "POST",
+                              headers,
+                              body: "{}",
+                          });
+                          
+                          let res = await fetch(apiUrl, {
+                              method: "GET",
+                              headers,
+                          });
+
+                          const data = await res.json();
+                          const topic = data.topic.replace(regex, releaseTopic);
+                          if (topic === data.topic) {
+                              console.log(roomId, "nothing to do");
+                              return;
+                          }
+                          if (data["org.matrix.msc3765.topic"]) {
+                              data["org.matrix.msc3765.topic"].forEach(d => {
+                                  d.body = d.body.replace(regex, releaseTopic);
+                              });
+                          }
+
+                          res = await fetch(apiUrl, {
+                              method: "PUT",
+                              body: JSON.stringify({
+                                  ...data,
+                                  topic,
+                              }),
+                              headers,
+                          });
+                          
+                          if (res.ok) {
+                              console.log(roomId, "topic updated:", topic);
+                          } else {
+                              console.log(roomId, await res.text());
+                          }
+                      }
+
+                      await updateReleaseInTopic(LOBBY_ROOM_ID);
+                      await updateReleaseInTopic(PUBLIC_ROOM_ID);
+                      await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID);
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,201 @@
+Changes in [1.11.35](https://github.com/vector-im/element-web/releases/tag/v1.11.35) (2023-07-04)
+=================================================================================================
+
+## 🦖 Deprecations
+ * Remove `feature_favourite_messages` as it is has been abandoned for now ([\#11097](https://github.com/matrix-org/matrix-react-sdk/pull/11097)). Fixes #25555.
+
+## ✨ Features
+ * Don't setup keys on login when encryption is force disabled ([\#11125](https://github.com/matrix-org/matrix-react-sdk/pull/11125)). Contributed by @kerryarchibald.
+ * OIDC: attempt dynamic client registration ([\#11074](https://github.com/matrix-org/matrix-react-sdk/pull/11074)). Fixes #25468 and #25467. Contributed by @kerryarchibald.
+ * OIDC: Check static client registration and add login flow ([\#11088](https://github.com/matrix-org/matrix-react-sdk/pull/11088)). Fixes #25467. Contributed by @kerryarchibald.
+ * Improve message body output from plain text editor ([\#11124](https://github.com/matrix-org/matrix-react-sdk/pull/11124)). Contributed by @alunturner.
+ * Disable encryption toggle in room settings when force disabled ([\#11122](https://github.com/matrix-org/matrix-react-sdk/pull/11122)). Contributed by @kerryarchibald.
+ * Add .well-known config option to force disable encryption on room creation ([\#11120](https://github.com/matrix-org/matrix-react-sdk/pull/11120)). Contributed by @kerryarchibald.
+ * Handle permalinks in room topic ([\#11115](https://github.com/matrix-org/matrix-react-sdk/pull/11115)). Fixes #23395.
+ * Add at room avatar for RTE ([\#11106](https://github.com/matrix-org/matrix-react-sdk/pull/11106)). Contributed by @alunturner.
+ * Remove new room breadcrumbs ([\#11104](https://github.com/matrix-org/matrix-react-sdk/pull/11104)).
+ * Update rich text editor dependency and associated changes ([\#11098](https://github.com/matrix-org/matrix-react-sdk/pull/11098)). Contributed by @alunturner.
+ * Implement new model, hooks and reconcilation code for new GYU notification settings ([\#11089](https://github.com/matrix-org/matrix-react-sdk/pull/11089)). Contributed by @justjanne.
+ * Allow maintaining a different right panel width for thread panels ([\#11064](https://github.com/matrix-org/matrix-react-sdk/pull/11064)). Fixes #25487.
+ * Make AppPermission pane scrollable ([\#10954](https://github.com/matrix-org/matrix-react-sdk/pull/10954)). Fixes #25438 and #25511. Contributed by @luixxiul.
+ * Integrate compound design tokens ([\#11091](https://github.com/matrix-org/matrix-react-sdk/pull/11091)). Fixes vector-im/internal-planning#450.
+ * Don't warn about the effects of redacting state events when redacting non-state-events ([\#11071](https://github.com/matrix-org/matrix-react-sdk/pull/11071)). Fixes #8478.
+ * Allow specifying help URLs in config.json ([\#11070](https://github.com/matrix-org/matrix-react-sdk/pull/11070)). Fixes #15268.
+
+## 🐛 Bug Fixes
+ * Fix error when generating error for polling for updates ([\#25609](https://github.com/vector-im/element-web/pull/25609)).
+ * Fix spurious notifications on non-live events ([\#11133](https://github.com/matrix-org/matrix-react-sdk/pull/11133)). Fixes #24336.
+ * Prevent auto-translation within composer ([\#11114](https://github.com/matrix-org/matrix-react-sdk/pull/11114)). Fixes #25624.
+ * Fix caret jump when backspacing into empty line at beginning of editor ([\#11128](https://github.com/matrix-org/matrix-react-sdk/pull/11128)). Fixes #22335.
+ * Fix server picker not allowing you to switch from custom to default ([\#11127](https://github.com/matrix-org/matrix-react-sdk/pull/11127)). Fixes #25650.
+ * Consider the unthreaded read receipt for Unread dot state ([\#11117](https://github.com/matrix-org/matrix-react-sdk/pull/11117)). Fixes #24229.
+ * Increase RTE resilience ([\#11111](https://github.com/matrix-org/matrix-react-sdk/pull/11111)). Fixes #25277. Contributed by @alunturner.
+ * Fix RoomView ignoring alias lookup errors due to them not knowing the roomId ([\#11099](https://github.com/matrix-org/matrix-react-sdk/pull/11099)). Fixes #24783 and #25562.
+ * Fix style inconsistencies on SecureBackupPanel ([\#11102](https://github.com/matrix-org/matrix-react-sdk/pull/11102)). Fixes #25615. Contributed by @luixxiul.
+ * Remove unknown MXIDs from invite suggestions ([\#11055](https://github.com/matrix-org/matrix-react-sdk/pull/11055)). Fixes #25446.
+ * Reduce volume of ring sounds to normalised levels ([\#9143](https://github.com/matrix-org/matrix-react-sdk/pull/9143)). Contributed by @JMoVS.
+ * Fix slash commands not being enabled in certain cases ([\#11090](https://github.com/matrix-org/matrix-react-sdk/pull/11090)). Fixes #25572.
+ * Prevent escape in threads from sending focus to main timeline composer ([\#11061](https://github.com/matrix-org/matrix-react-sdk/pull/11061)). Fixes #23397.
+
+Changes in [1.11.34](https://github.com/vector-im/element-web/releases/tag/v1.11.34) (2023-06-20)
+=================================================================================================
+
+## ✨ Features
+ * OIDC: add delegatedauthentication to validated server config ([\#11053](https://github.com/matrix-org/matrix-react-sdk/pull/11053)). Contributed by @kerryarchibald.
+ * Allow image pasting in plain mode in RTE ([\#11056](https://github.com/matrix-org/matrix-react-sdk/pull/11056)). Contributed by @alunturner.
+ * Show room options menu if "UIComponent.roomOptionsMenu" is enabled ([\#10365](https://github.com/matrix-org/matrix-react-sdk/pull/10365)). Contributed by @maheichyk.
+ * Allow image pasting in rich text mode in RTE ([\#11049](https://github.com/matrix-org/matrix-react-sdk/pull/11049)). Contributed by @alunturner.
+ * Update voice broadcast redaction to use MSC3912 `with_rel_type` instead of `with_relations` ([\#11014](https://github.com/matrix-org/matrix-react-sdk/pull/11014)). Fixes #25471.
+ * Add config to skip widget_build_url for DM rooms ([\#11044](https://github.com/matrix-org/matrix-react-sdk/pull/11044)). Fixes vector-im/customer-retainer#74.
+ * Inhibit interactions on forward dialog message previews ([\#11025](https://github.com/matrix-org/matrix-react-sdk/pull/11025)). Fixes #23459.
+ * Removed `DecryptionFailureBar.tsx` ([\#11027](https://github.com/matrix-org/matrix-react-sdk/pull/11027)). Fixes vector-im/element-meta#1358. Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+ * Fix translucent `TextualEvent` on search results panel ([\#10810](https://github.com/matrix-org/matrix-react-sdk/pull/10810)). Fixes #25292. Contributed by @luixxiul.
+ * Matrix matrix scheme permalink constructor not stripping query params ([\#11060](https://github.com/matrix-org/matrix-react-sdk/pull/11060)). Fixes #25535.
+ * Fix: "manually verify by text" does nothing ([\#11059](https://github.com/matrix-org/matrix-react-sdk/pull/11059)). Fixes #25375. Contributed by @kerryarchibald.
+ * Make group calls respect the ICE fallback setting ([\#11047](https://github.com/matrix-org/matrix-react-sdk/pull/11047)). Fixes vector-im/voip-internal#65.
+ * Align list items on the tooltip to the start ([\#11041](https://github.com/matrix-org/matrix-react-sdk/pull/11041)). Fixes #25355. Contributed by @luixxiul.
+ * Clear thread panel event permalink when changing rooms ([\#11024](https://github.com/matrix-org/matrix-react-sdk/pull/11024)). Fixes #25484.
+ * Fix spinner placement on pinned widgets being reloaded ([\#10970](https://github.com/matrix-org/matrix-react-sdk/pull/10970)). Fixes #25431. Contributed by @luixxiul.
+
+Changes in [1.11.33](https://github.com/vector-im/element-web/releases/tag/v1.11.33) (2023-06-09)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Bump matrix-react-sdk to v3.73.1 for matrix-js-sdk v26.0.1. Fixes #25526.
+
+Changes in [1.11.32](https://github.com/vector-im/element-web/releases/tag/v1.11.32) (2023-06-06)
+=================================================================================================
+
+## ✨ Features
+ * Redirect to the SSO page if `sso_redirect_options.on_welcome_page` is enabled and the URL hash is empty ([\#25495](https://github.com/vector-im/element-web/pull/25495)). Contributed by @dhenneke.
+ * vector/index.html: Allow fetching blob urls ([\#25336](https://github.com/vector-im/element-web/pull/25336)). Contributed by @SuperKenVery.
+ * When joining room in sub-space join the parents too ([\#11011](https://github.com/matrix-org/matrix-react-sdk/pull/11011)).
+ * Include thread replies in message previews ([\#10631](https://github.com/matrix-org/matrix-react-sdk/pull/10631)). Fixes #23920.
+ * Use semantic headings in space preferences ([\#11021](https://github.com/matrix-org/matrix-react-sdk/pull/11021)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - Ignored users ([\#11006](https://github.com/matrix-org/matrix-react-sdk/pull/11006)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - profile ([\#10973](https://github.com/matrix-org/matrix-react-sdk/pull/10973)). Fixes #25461. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - account ([\#10972](https://github.com/matrix-org/matrix-react-sdk/pull/10972)). Contributed by @kerryarchibald.
+ * Support `Insert from iPhone or iPad` in Safari ([\#10851](https://github.com/matrix-org/matrix-react-sdk/pull/10851)). Fixes #25327. Contributed by @SuperKenVery.
+ * Specify supportedStages for User Interactive Auth ([\#10975](https://github.com/matrix-org/matrix-react-sdk/pull/10975)). Fixes #19605.
+ * Pass device id to widgets ([\#10209](https://github.com/matrix-org/matrix-react-sdk/pull/10209)). Contributed by @Fox32.
+ * Use semantic headings in user settings - discovery ([\#10838](https://github.com/matrix-org/matrix-react-sdk/pull/10838)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings -  Notifications ([\#10948](https://github.com/matrix-org/matrix-react-sdk/pull/10948)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - spellcheck and language ([\#10959](https://github.com/matrix-org/matrix-react-sdk/pull/10959)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Appearance ([\#10827](https://github.com/matrix-org/matrix-react-sdk/pull/10827)). Contributed by @kerryarchibald.
+ * Use semantic heading in user settings Sidebar & Voip ([\#10782](https://github.com/matrix-org/matrix-react-sdk/pull/10782)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Security ([\#10774](https://github.com/matrix-org/matrix-react-sdk/pull/10774)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - integrations and account deletion ([\#10837](https://github.com/matrix-org/matrix-react-sdk/pull/10837)). Fixes #25378. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Preferences ([\#10794](https://github.com/matrix-org/matrix-react-sdk/pull/10794)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Keyboard ([\#10793](https://github.com/matrix-org/matrix-react-sdk/pull/10793)). Contributed by @kerryarchibald.
+ * RTE plain text mentions as pills ([\#10852](https://github.com/matrix-org/matrix-react-sdk/pull/10852)). Contributed by @alunturner.
+ * Allow welcome.html logo to be replaced by config ([\#25339](https://github.com/vector-im/element-web/pull/25339)). Fixes #8636.
+ * Use semantic headings in user settings Labs ([\#10773](https://github.com/matrix-org/matrix-react-sdk/pull/10773)). Contributed by @kerryarchibald.
+ * Use semantic list elements for menu lists and tab lists ([\#10902](https://github.com/matrix-org/matrix-react-sdk/pull/10902)). Fixes #24928.
+ * Fix aria-required-children axe violation ([\#10900](https://github.com/matrix-org/matrix-react-sdk/pull/10900)). Fixes #25342.
+ * Enable pagination for overlay timelines ([\#10757](https://github.com/matrix-org/matrix-react-sdk/pull/10757)). Fixes vector-im/voip-internal#107.
+ * Add tooltip to disabled invite button due to lack of permissions ([\#10869](https://github.com/matrix-org/matrix-react-sdk/pull/10869)). Fixes #9824.
+ * Respect configured auth_header_logo_url for default Welcome page ([\#10870](https://github.com/matrix-org/matrix-react-sdk/pull/10870)).
+ * Specify lazy loading for avatars ([\#10866](https://github.com/matrix-org/matrix-react-sdk/pull/10866)). Fixes #1983.
+ * Room and user mentions for plain text editor ([\#10665](https://github.com/matrix-org/matrix-react-sdk/pull/10665)). Contributed by @alunturner.
+ * Add audible notifcation on broadcast error ([\#10654](https://github.com/matrix-org/matrix-react-sdk/pull/10654)). Fixes #25132.
+ * Fall back from server generated thumbnail to original image ([\#10853](https://github.com/matrix-org/matrix-react-sdk/pull/10853)).
+ * Use semantically correct elements for room sublist context menu ([\#10831](https://github.com/matrix-org/matrix-react-sdk/pull/10831)). Fixes vector-im/customer-retainer#46.
+ * Avoid calling prepareToEncrypt onKeyDown ([\#10828](https://github.com/matrix-org/matrix-react-sdk/pull/10828)).
+ * Allows search to recognize full room links ([\#8275](https://github.com/matrix-org/matrix-react-sdk/pull/8275)). Contributed by @bolu-tife.
+ * "Show rooms with unread messages first" should not be on by default for new users ([\#10820](https://github.com/matrix-org/matrix-react-sdk/pull/10820)). Fixes #25304. Contributed by @kerryarchibald.
+ * Fix emitter handler leak in ThreadView ([\#10803](https://github.com/matrix-org/matrix-react-sdk/pull/10803)).
+ * Add better error for email invites without identity server ([\#10739](https://github.com/matrix-org/matrix-react-sdk/pull/10739)). Fixes #16893.
+ * Move reaction message previews out of labs ([\#10601](https://github.com/matrix-org/matrix-react-sdk/pull/10601)). Fixes #25083.
+ * Sort muted rooms to the bottom of their section of the room list ([\#10592](https://github.com/matrix-org/matrix-react-sdk/pull/10592)). Fixes #25131. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Help & About ([\#10752](https://github.com/matrix-org/matrix-react-sdk/pull/10752)). Contributed by @kerryarchibald.
+ * use ExternalLink components for external links ([\#10758](https://github.com/matrix-org/matrix-react-sdk/pull/10758)). Contributed by @kerryarchibald.
+ * Use semantic headings in space settings ([\#10751](https://github.com/matrix-org/matrix-react-sdk/pull/10751)). Contributed by @kerryarchibald.
+ * Use semantic headings for room settings content ([\#10734](https://github.com/matrix-org/matrix-react-sdk/pull/10734)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Use consistent fonts for Japanese text ([\#10980](https://github.com/matrix-org/matrix-react-sdk/pull/10980)). Fixes #22333 and #23899.
+ * Fix: server picker validates unselected option ([\#11020](https://github.com/matrix-org/matrix-react-sdk/pull/11020)). Fixes #25488. Contributed by @kerryarchibald.
+ * Fix room list notification badges going missing in compact layout ([\#11022](https://github.com/matrix-org/matrix-react-sdk/pull/11022)). Fixes #25372.
+ * Fix call to `startSingleSignOn` passing enum in place of idpId ([\#10998](https://github.com/matrix-org/matrix-react-sdk/pull/10998)). Fixes #24953.
+ * Remove hover effect from user name on a DM creation UI ([\#10887](https://github.com/matrix-org/matrix-react-sdk/pull/10887)). Fixes #25305. Contributed by @luixxiul.
+ * Fix layout regression in public space invite dialog ([\#11009](https://github.com/matrix-org/matrix-react-sdk/pull/11009)). Fixes #25458.
+ * Fix layout regression in session dropdown ([\#10999](https://github.com/matrix-org/matrix-react-sdk/pull/10999)). Fixes #25448.
+ * Fix spacing regression in user settings - roles & permissions ([\#10993](https://github.com/matrix-org/matrix-react-sdk/pull/10993)). Fixes #25447 and #25451. Contributed by @kerryarchibald.
+ * Fall back to receipt timestamp if we have no event (react-sdk part) ([\#10974](https://github.com/matrix-org/matrix-react-sdk/pull/10974)). Fixes #10954. Contributed by @andybalaam.
+ * Fix: Room header 'view your device list' does not link to new session manager ([\#10979](https://github.com/matrix-org/matrix-react-sdk/pull/10979)). Fixes #25440. Contributed by @kerryarchibald.
+ * Fix display of devices without encryption support in Settings dialog ([\#10977](https://github.com/matrix-org/matrix-react-sdk/pull/10977)). Fixes #25413.
+ * Use aria descriptions instead of labels for TextWithTooltip ([\#10952](https://github.com/matrix-org/matrix-react-sdk/pull/10952)). Fixes #25398.
+ * Use grapheme-splitter instead of lodash for saving emoji from being ripped apart ([\#10976](https://github.com/matrix-org/matrix-react-sdk/pull/10976)). Fixes #22196.
+ * Fix: content overflow in settings subsection ([\#10960](https://github.com/matrix-org/matrix-react-sdk/pull/10960)). Fixes #25416. Contributed by @kerryarchibald.
+ * Make `Privacy Notice` external link on integration manager ToS clickable ([\#10914](https://github.com/matrix-org/matrix-react-sdk/pull/10914)). Fixes #25384. Contributed by @luixxiul.
+ * Ensure that open message context menus are updated when the event is sent ([\#10950](https://github.com/matrix-org/matrix-react-sdk/pull/10950)).
+ * Ensure that open sticker picker dialogs are updated when the widget configuration is updated. ([\#10945](https://github.com/matrix-org/matrix-react-sdk/pull/10945)).
+ * Fix big emoji in replies ([\#10932](https://github.com/matrix-org/matrix-react-sdk/pull/10932)). Fixes #24798.
+ * Hide empty `MessageActionBar` on message edit history dialog ([\#10447](https://github.com/matrix-org/matrix-react-sdk/pull/10447)). Fixes #24903. Contributed by @luixxiul.
+ * Fix roving tab index getting confused after dragging space order ([\#10901](https://github.com/matrix-org/matrix-react-sdk/pull/10901)).
+ * Attempt a potential workaround for stuck notifs ([\#3384](https://github.com/matrix-org/matrix-js-sdk/pull/3384)). Fixes vector-im/element-web#25406. Contributed by @andybalaam.
+ * Handle trailing dot FQDNs for domain-specific config.json files ([\#25351](https://github.com/vector-im/element-web/pull/25351)). Fixes #8858.
+ * Ignore edits in message previews when they concern messages other than latest ([\#10868](https://github.com/matrix-org/matrix-react-sdk/pull/10868)). Fixes #14872.
+ * Send correct receipts when viewing a room ([\#10864](https://github.com/matrix-org/matrix-react-sdk/pull/10864)). Fixes #25196.
+ * Fix timeline search bar being overlapped by the right panel ([\#10809](https://github.com/matrix-org/matrix-react-sdk/pull/10809)). Fixes #25291. Contributed by @luixxiul.
+ * Fix the state shown for call in rooms ([\#10833](https://github.com/matrix-org/matrix-react-sdk/pull/10833)).
+ * Add string for membership event where both displayname & avatar change ([\#10880](https://github.com/matrix-org/matrix-react-sdk/pull/10880)). Fixes #18026.
+ * Fix people space notification badge not updating for new DM invites ([\#10849](https://github.com/matrix-org/matrix-react-sdk/pull/10849)). Fixes #23248.
+ * Fix regression in emoji picker order mangling after clearing filter ([\#10854](https://github.com/matrix-org/matrix-react-sdk/pull/10854)). Fixes #25323.
+ * Fix: Edit history modal crash ([\#10834](https://github.com/matrix-org/matrix-react-sdk/pull/10834)). Fixes #25309. Contributed by @kerryarchibald.
+ * Fix long room address and name not being clipped on room info card and update `_RoomSummaryCard.pcss` ([\#10811](https://github.com/matrix-org/matrix-react-sdk/pull/10811)). Fixes #25293. Contributed by @luixxiul.
+ * Treat thumbnail upload failures as complete upload failures ([\#10829](https://github.com/matrix-org/matrix-react-sdk/pull/10829)). Fixes #7069.
+ * Update finite automata to match user identifiers as per spec ([\#10798](https://github.com/matrix-org/matrix-react-sdk/pull/10798)). Fixes #25246.
+ * Fix icon on empty notification panel ([\#10817](https://github.com/matrix-org/matrix-react-sdk/pull/10817)). Fixes #25298 and #25302. Contributed by @luixxiul.
+ * Fix: Threads button is highlighted when I create a new room ([\#10819](https://github.com/matrix-org/matrix-react-sdk/pull/10819)). Fixes #25284. Contributed by @kerryarchibald.
+ * Fix the top heading of notification panel ([\#10818](https://github.com/matrix-org/matrix-react-sdk/pull/10818)). Fixes #25303. Contributed by @luixxiul.
+ * Fix the color of the verified E2EE icon on `RoomSummaryCard` ([\#10812](https://github.com/matrix-org/matrix-react-sdk/pull/10812)). Fixes #25295. Contributed by @luixxiul.
+ * Fix: No feedback when waiting for the server on a /delete_devices request with SSO ([\#10795](https://github.com/matrix-org/matrix-react-sdk/pull/10795)). Fixes #23096. Contributed by @kerryarchibald.
+ * Fix: reveal images when image previews are disabled ([\#10781](https://github.com/matrix-org/matrix-react-sdk/pull/10781)). Fixes #25271. Contributed by @kerryarchibald.
+ * Fix accessibility issues around the room list and space panel ([\#10717](https://github.com/matrix-org/matrix-react-sdk/pull/10717)). Fixes #13345.
+ * Ensure tooltip contents is linked via aria to the target element ([\#10729](https://github.com/matrix-org/matrix-react-sdk/pull/10729)). Fixes vector-im/customer-retainer#43.
+
+Changes in [1.11.31](https://github.com/vector-im/element-web/releases/tag/v1.11.31) (2023-05-10)
+=================================================================================================
+
+## ✨ Features
+ * Improve Content-Security-Policy ([\#25210](https://github.com/vector-im/element-web/pull/25210)).
+ * Add UIFeature.locationSharing to hide location sharing ([\#10727](https://github.com/matrix-org/matrix-react-sdk/pull/10727)).
+ * Memoize field validation results ([\#10714](https://github.com/matrix-org/matrix-react-sdk/pull/10714)).
+ * Commands for plain text editor ([\#10567](https://github.com/matrix-org/matrix-react-sdk/pull/10567)). Contributed by @alunturner.
+ * Allow 16 lines of text in the rich text editors ([\#10670](https://github.com/matrix-org/matrix-react-sdk/pull/10670)). Contributed by @alunturner.
+ * Bail out of `RoomSettingsDialog` when room is not found ([\#10662](https://github.com/matrix-org/matrix-react-sdk/pull/10662)). Contributed by @kerryarchibald.
+ * Element-R: Populate device list for right-panel ([\#10671](https://github.com/matrix-org/matrix-react-sdk/pull/10671)). Contributed by @florianduros.
+ * Make existing and new issue URLs configurable ([\#10710](https://github.com/matrix-org/matrix-react-sdk/pull/10710)). Fixes #24424.
+ * Fix usages of ARIA tabpanel ([\#10628](https://github.com/matrix-org/matrix-react-sdk/pull/10628)). Fixes #25016.
+ * Element-R: Starting a DMs with a user ([\#10673](https://github.com/matrix-org/matrix-react-sdk/pull/10673)). Contributed by @florianduros.
+ * ARIA Accessibility improvements ([\#10675](https://github.com/matrix-org/matrix-react-sdk/pull/10675)).
+ * ARIA Accessibility improvements ([\#10674](https://github.com/matrix-org/matrix-react-sdk/pull/10674)).
+ * Add arrow key controls to emoji and reaction pickers ([\#10637](https://github.com/matrix-org/matrix-react-sdk/pull/10637)). Fixes #17189.
+ * Translate credits in help about section ([\#10676](https://github.com/matrix-org/matrix-react-sdk/pull/10676)).
+
+## 🐛 Bug Fixes
+ * Fix: reveal images when image previews are disabled ([\#10781](https://github.com/matrix-org/matrix-react-sdk/pull/10781)). Fixes #25271. Contributed by @kerryarchibald.
+ * Fix autocomplete not resetting properly on message send ([\#10741](https://github.com/matrix-org/matrix-react-sdk/pull/10741)). Fixes #25170.
+ * Fix start_sso not working with guests disabled ([\#10720](https://github.com/matrix-org/matrix-react-sdk/pull/10720)). Fixes #16624.
+ * Fix soft crash with Element call widgets ([\#10684](https://github.com/matrix-org/matrix-react-sdk/pull/10684)).
+ * Send correct receipt when marking a room as read ([\#10730](https://github.com/matrix-org/matrix-react-sdk/pull/10730)). Fixes #25207.
+ * Offload some more waveform processing onto a worker ([\#9223](https://github.com/matrix-org/matrix-react-sdk/pull/9223)). Fixes #19756.
+ * Consolidate login errors ([\#10722](https://github.com/matrix-org/matrix-react-sdk/pull/10722)). Fixes #17520.
+ * Fix all rooms search generating permalinks to wrong room id ([\#10625](https://github.com/matrix-org/matrix-react-sdk/pull/10625)). Fixes #25115.
+ * Posthog properly handle Analytics ID changing from under us ([\#10702](https://github.com/matrix-org/matrix-react-sdk/pull/10702)). Fixes #25187.
+ * Fix Clock being read as an absolute time rather than duration ([\#10706](https://github.com/matrix-org/matrix-react-sdk/pull/10706)). Fixes #22582.
+ * Properly translate errors in `ChangePassword.tsx` so they show up translated to the user but not in our logs ([\#10615](https://github.com/matrix-org/matrix-react-sdk/pull/10615)). Fixes #9597. Contributed by @MadLittleMods.
+ * Honour feature toggles in guest mode ([\#10651](https://github.com/matrix-org/matrix-react-sdk/pull/10651)). Fixes #24513. Contributed by @andybalaam.
+ * Fix default content in devtools event sender ([\#10699](https://github.com/matrix-org/matrix-react-sdk/pull/10699)). Contributed by @tulir.
+ * Fix a crash when a call ends while you're in it ([\#10681](https://github.com/matrix-org/matrix-react-sdk/pull/10681)). Fixes #25153.
+ * Fix lack of screen reader indication when triggering auto complete ([\#10664](https://github.com/matrix-org/matrix-react-sdk/pull/10664)). Fixes #11011.
+ * Fix typing tile duplicating users ([\#10678](https://github.com/matrix-org/matrix-react-sdk/pull/10678)). Fixes #25165.
+ * Fix wrong room topic tooltip position ([\#10667](https://github.com/matrix-org/matrix-react-sdk/pull/10667)). Fixes #25158.
+ * Fix create subspace dialog not working ([\#10652](https://github.com/matrix-org/matrix-react-sdk/pull/10652)). Fixes #24882.
+
 Changes in [1.11.30](https://github.com/vector-im/element-web/releases/tag/v1.11.30) (2023-04-25)
 =================================================================================================

--- a/2
+++ b/2
@ -15,7 +15,7 @@ WORKDIR /src

 COPY . /src
 RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
-RUN yarn --network-timeout=100000 install
+RUN yarn --network-timeout=200000 install

 RUN dos2unix /src/scripts/docker-package.sh && bash /src/scripts/docker-package.sh

--- a/config.sample.json
+++ b/config.sample.json
@ -22,8 +22,6 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
-    "uisi_autorageshake_app": "element-auto-uisi",
    "default_country_code": "GB",
    "show_labs_settings": false,
    "features": {},
--- a/docs/config.md
+++ b/docs/config.md
@ -1,5 +1,13 @@
 # Configuration

+### 🦖 Deprecation notice
+
+Configuration keys were previously a mix of camelCase and snake_case.
+We standardised to snake_case but added compatibility for camelCase to all settings.
+This backwards compatibility will be getting removed in a future release so please ensure you are using snake_case.
+
+---
+
 You can configure the app by copying `config.sample.json` to `config.json` or `config.$domain.json` and customising it.
 Element will attempt to load first `config.$domain.json` and if it fails `config.json`. This mechanism allows different
 configuration options depending on if you're hitting e.g. `app1.example.com` or `app2.example.com`. Configs are not mixed
@ -45,8 +53,9 @@ One of the following options **must** be supplied:
   information. These are the same values seen as `base_url` in the `default_server_config` example, with `default_is_url`
   being optional.

-If a combination of these three methods is used then Element will fail to load. This is because it is unclear which
-should be considered "first".
+If both `default_server_config` and `default_server_name` are used, Element will try to look up the connection
+infomation using `.well-known`, and if that fails, take `default_server_config` as the homeserver connection
+infomation.

 ## Labs flags

@ -144,6 +153,8 @@ complete re-branding/private labeling, a more personalised experience can be ach
    1. `title`: Required. Title to show at the top of the notice.
    2. `description`: Required. The description to use for the notice.
    3. `show_once`: Optional. If true then the notice will only be shown once per device.
+18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
+19. `help_encrption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.

 ### `desktop_builds` and `mobile_builds`

@ -320,7 +331,8 @@ The VoIP and Jitsi options are:
    }
    ```
    The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
-    as defined by the `io.element.widgets.layout` state event.
+    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for DMs
+    by setting the option `widget_build_url_ignore_dm` to `true`.
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
   at any time without notice.
 6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:
--- a/docs/customisations.md
+++ b/docs/customisations.md
@ -1,5 +1,13 @@
 # Customisations

+### 🦖 DEPRECATED
+
+Customisations have been deprecated in favour of the [Module API](https://github.com/vector-im/element-web/blob/develop/docs/modules.md).
+If you have use cases from customisations which are not yet available via the Module API please open an issue.
+Customisations will be removed from the codebase in a future release.
+
+---
+
 Element Web and the React SDK support "customisation points" that can be used to
 easily add custom logic specific to a particular deployment of Element Web.

--- a/docs/e2ee.md
+++ b/docs/e2ee.md
@ -16,6 +16,28 @@ Set the following on your homeserver's
 }
 ```

+## Disabling encryption
+
+Set the following on your homeserver's
+`/.well-known/matrix/client` config:
+
+```json
+{
+    "io.element.e2ee": {
+        "force_disable": true
+    }
+}
+```
+
+When `force_disable` is true:
+
+-   all rooms will be created with encryption disabled, and it will not be possible to enable
+    encryption from room settings.
+-   any `io.element.e2ee.default` value will be disregarded.
+
+Note: If the server is configured to forcibly enable encryption for some or all rooms,
+this behaviour will be overriden.
+
 # Secure backup

 By default, Element strongly encourages (but does not require) users to set up
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@ -30,7 +30,7 @@ to your [config](./config.md) the following:
 ```json
 {
    "jitsi": {
-        "preferredDomain": "your.jitsi.example.org"
+        "preferred_domain": "your.jitsi.example.org"
    }
 }
 ```
--- a/docs/labs.md
+++ b/docs/labs.md
@ -105,11 +105,6 @@ For some sample themes, check out [aaronraimist/element-themes](https://github.c
 Allows users to receive encrypted messages by creating a device that is stored
 encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).

-## Breadcrumbs v2 (`feature_breadcrumbs_v2`)
-
-Instead of showing the horizontal list of breadcrumbs under the filter field, the new UX is an interactive context menu
-triggered by the button to the right of the filter field.
-
 ## Spotlight search (`feature_spotlight`) [In Development]

 Switches to a new room search experience.
@ -168,10 +163,6 @@ Enables rendering of MD / HTML in room topics.
 Enables exploring public spaces in the new search dialog. Requires the server to
 have [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827) enabled.

-## Favourite Messages (`feature_favourite_messages`) [In Development]
-
-Enables users to bookmark a message or content for a later reference.
-
 ## Sign in another device by showing a QR code (`feature_qr_signin_reciprocate_show`)

 Add capability to the session/device manager screens to generate a QR code to sign in another device + set up E2EE. This requires the homeserver to have support for [MSC3882](https://github.com/matrix-org/matrix-spec-proposals/pull/3882) and [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) enabled.
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@ -1,5 +1,13 @@
 {
    "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
    "brand": "Element",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@ -1,5 +1,13 @@
 {
    "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
    "brand": "Element",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
@ -44,7 +52,7 @@
        "feature_video_rooms": true
    },
    "element_call": {
-        "url": "https://element-call.netlify.app"
+        "url": "https://element-call-livekit.netlify.app"
    },
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "element-web",
-    "version": "1.11.30",
+    "version": "1.11.35",
    "description": "A feature-rich client for Matrix.org",
    "author": "New Vector Ltd.",
    "repository": {
@ -61,7 +61,8 @@
        "lint:style": "stylelint \"res/css/**/*.pcss\"",
        "test": "jest",
        "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js"
+        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js",
+        "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp"
    },
    "resolutions": {
        "@types/react-dom": "17.0.19",
@ -69,7 +70,7 @@
    },
    "dependencies": {
        "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
-        "@matrix-org/react-sdk-module-api": "^0.0.5",
+        "@matrix-org/react-sdk-module-api": "^1.0.0",
        "gfm.css": "^1.1.2",
        "jsrsasign": "^10.5.25",
        "katex": "^0.16.0",
@ -87,6 +88,7 @@
        "@babel/eslint-plugin": "^7.12.10",
        "@babel/plugin-proposal-class-properties": "^7.12.1",
        "@babel/plugin-proposal-export-default-from": "^7.12.1",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
        "@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",
@ -100,7 +102,7 @@
        "@babel/runtime": "^7.12.5",
        "@casualbot/jest-sonar-reporter": "^2.2.5",
        "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@sentry/webpack-plugin": "^1.18.1",
+        "@sentry/webpack-plugin": "^2.0.0",
        "@svgr/webpack": "^5.5.0",
        "@testing-library/react": "^12.1.5",
        "@types/jest": "^29.0.0",
@ -122,7 +124,7 @@
        "cpx": "^1.5.0",
        "css-loader": "^4",
        "dotenv": "^16.0.2",
-        "eslint": "8.39.0",
+        "eslint": "8.43.0",
        "eslint-config-google": "^0.14.0",
        "eslint-config-prettier": "^8.5.0",
        "eslint-plugin-deprecate": "^0.7.0",
@ -130,7 +132,7 @@
        "eslint-plugin-matrix-org": "^1.0.0",
        "eslint-plugin-react": "^7.28.0",
        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^46.0.0",
+        "eslint-plugin-unicorn": "^47.0.0",
        "extract-text-webpack-plugin": "^4.0.0-beta.0",
        "fake-indexeddb": "^4.0.0",
        "fetch-mock-jest": "^1.5.1",
@ -138,7 +140,7 @@
        "fs-extra": "^11.0.0",
        "html-webpack-plugin": "^4.5.2",
        "jest": "^29.0.0",
-        "jest-canvas-mock": "2.4.0",
+        "jest-canvas-mock": "2.5.2",
        "jest-environment-jsdom": "^29.0.0",
        "jest-mock": "^29.0.0",
        "jest-raw-loader": "^1.0.1",
@ -165,18 +167,19 @@
        "prettier": "2.8.8",
        "raw-loader": "^4.0.2",
        "rimraf": "^5.0.0",
-        "semver": "^7.3.7",
+        "semver": "^7.5.2",
        "simple-proxy-agent": "^1.1.0",
        "string-replace-loader": "3",
        "style-loader": "2",
-        "stylelint": "^15.3.0",
-        "stylelint-config-standard": "^33.0.0",
+        "stylelint": "^15.10.1",
+        "stylelint-config-standard": "^34.0.0",
        "stylelint-scss": "^5.0.0",
        "terser-webpack-plugin": "^4.0.0",
        "ts-node": "^10.9.1",
        "ts-prune": "^0.10.3",
        "typescript": "5.0.4",
        "webpack": "^4.46.0",
+        "webpack-bundle-analyzer": "^4.8.0",
        "webpack-cli": "^3.3.12",
        "webpack-dev-server": "^3.11.2",
        "worker-loader": "^3.0.0",
--- a/res/welcome.html
+++ b/res/welcome.html
@ -167,7 +167,7 @@ we don't have an account and should hide them. No account == no guest account ei

 <div class="mx_Parent">
    <a href="https://element.io" target="_blank" rel="noopener">
-        <img src="welcome/images/logo.svg" alt="" class="mx_Logo" />
+        <img src="$logoUrl" alt="" class="mx_Logo" />
    </a>
    <h1 class="mx_Header_title">_t("Welcome to Element")</h1>
    <!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
@ -181,11 +181,6 @@ we don't have an account and should hide them. No account == no guest account ei
                <div class="mx_ButtonLabel">_t("Create Account")</div>
            </a>
        </div>
-        <!-- The comments below are meant to be used by Ansible as a quick way
-             to strip out the marked content when desired.
-             See https://github.com/vector-im/element-web/issues/8622.
-             TODO: Strip out these comments and rely on the guest flag -->
-        <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
        <div class="mx_ButtonRow mx_WelcomePage_guestFunctions">
            <div>
                <a href="#/directory" class="mx_ButtonParent mx_SecondaryButton mx_Button_iconRoomDirectory">
@ -193,6 +188,5 @@ we don't have an account and should hide them. No account == no guest account ei
                </a>
            </div>
        </div>
-        <!-- END Ansible: Remove these lines when guest access is disabled -->
    </div>
 </div>
--- a/res/welcome/images/logo.svg
+++ b/res/welcome/images/logo.svg
@ -1,7 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M100 200C155.228 200 200 155.228 200 100C200 44.7715 155.228 0 100 0C44.7715 0 0 44.7715 0 100C0 155.228 44.7715 200 100 200Z" fill="#0DBD8B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M81.7169 46.5946C81.7169 42.5581 84.9959 39.2859 89.0408 39.2859C116.456 39.2859 138.681 61.4642 138.681 88.8225C138.681 92.859 135.401 96.1312 131.357 96.1312C127.312 96.1312 124.033 92.859 124.033 88.8225C124.033 69.5372 108.366 53.9033 89.0408 53.9033C84.9959 53.9033 81.7169 50.6311 81.7169 46.5946Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M153.39 81.5137C157.435 81.5137 160.714 84.7859 160.714 88.8224C160.714 116.181 138.49 138.359 111.075 138.359C107.03 138.359 103.751 135.087 103.751 131.05C103.751 127.014 107.03 123.742 111.075 123.742C130.4 123.742 146.066 108.108 146.066 88.8224C146.066 84.7859 149.345 81.5137 153.39 81.5137Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M118.398 153.405C118.398 157.442 115.119 160.714 111.074 160.714C83.6592 160.714 61.4347 138.536 61.4347 111.177C61.4347 107.141 64.7138 103.869 68.7587 103.869C72.8035 103.869 76.0826 107.141 76.0826 111.177C76.0826 130.463 91.7489 146.097 111.074 146.097C115.119 146.097 118.398 149.369 118.398 153.405Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M46.6097 118.486C42.5648 118.486 39.2858 115.214 39.2858 111.178C39.2858 83.8193 61.5102 61.6409 88.9255 61.6409C92.9704 61.6409 96.2494 64.9132 96.2494 68.9497C96.2494 72.9862 92.9704 76.2584 88.9255 76.2584C69.6 76.2584 53.9337 91.8922 53.9337 111.178C53.9337 115.214 50.6546 118.486 46.6097 118.486Z" fill="white"/>
-</svg>
--- a/scripts/layered.sh
+++ b/scripts/layered.sh
@ -21,27 +21,30 @@ export PR_ORG=vector-im
 export PR_REPO=element-web

 # Set up the js-sdk first
-node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk develop
 pushd matrix-js-sdk
 yarn link
 yarn install --frozen-lockfile
 popd

-# Also set up matrix-analytics-events so we get the latest from
-# the main branch or a branch with matching name
-node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events main
-pushd matrix-analytics-events
-yarn link
-yarn install --frozen-lockfile
-yarn build:ts
-popd
+# Also set up matrix-analytics-events for branch with matching name
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events
+# We don't pass a default branch so cloning may fail when we are not in a PR
+# This is expected as this project does not share a release cycle but we still branch match it
+if [ -d matrix-analytics-events ]; then
+    pushd matrix-analytics-events
+    yarn link
+    yarn install --frozen-lockfile
+    yarn build:ts
+    popd
+fi

 # Now set up the react-sdk
-node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk
+node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk develop
 pushd matrix-react-sdk
 yarn link
 yarn link matrix-js-sdk
-yarn link @matrix-org/analytics-events
+[ -d matrix-analytics-events ] && yarn link @matrix-org/analytics-events
 yarn install --frozen-lockfile
 popd

--- a/scripts/make-icons.sh
+++ b/scripts/make-icons.sh
@ -1,116 +0,0 @@
-#!/usr/bin/env bash
-#
-# Converts an svg logo into the various image resources required by
-# the various platforms deployments.
-#
-# On debian-based systems you need these deps:
-#   apt-get install xmlstarlet python3-cairosvg icnsutils
-
-if [ $# != 1 ]
-then
-    echo "Usage: $0 <svg file>"
-    exit
-fi
-
-set -ex
-
-tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'`
-
-for i in 1024 512 310 256 192 180 152 150 144 128 120 114 96 76 72 70 64 60 57 48 36 32 24 16
-do
-    #convert -background none -density 1000 -resize $i -extent $i -gravity center "$1" "$tmpdir/$i.png"
-
-    # Above is the imagemagick command to render an svg to png. Unfortunately, its support for SVGs
-    # with CSS isn't very good (with rsvg and even moreso the built in renderer) so we use cairosvg.
-    # This can be installed with:
-    #    pip install cairosvg==1.0.22 # Version 2 doesn't support python 2
-    #    pip install tinycss
-    #    pip install cssselect # These are necessary for CSS support
-    # You'll also need xmlstarlet from your favourite package manager
-    #
-    # Cairosvg doesn't suport rendering at a specific size (https://github.com/Kozea/CairoSVG/issues/83#issuecomment-215720176)
-    # so we have to 'resize the svg' first (add width and height attributes to the svg element) to make it render at the
-    # size we need.
-    # XXX: This will break if the svg already has width and height attributes
-    cp "$1" "$tmpdir/tmp.svg"
-    xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n width -v $i "$tmpdir/tmp.svg" > "$tmpdir/tmp2.svg"
-    xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n height -v $i "$tmpdir/tmp2.svg" > "$tmpdir/tmp3.svg"
-    cairosvg -f png -o "$tmpdir/$i.png"  "$tmpdir/tmp3.svg"
-    rm "$tmpdir/tmp.svg" "$tmpdir/tmp2.svg" "$tmpdir/tmp3.svg"
-done
-
-# one more for the non-square mstile
-cp "$1" "$tmpdir/tmp.svg"
-xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n width -v 310 "$tmpdir/tmp.svg" > "$tmpdir/tmp2.svg"
-xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n height -v 150 "$tmpdir/tmp2.svg" > "$tmpdir/tmp3.svg"
-cairosvg -f png -o "$tmpdir/310x150.png"  "$tmpdir/tmp3.svg"
-rm "$tmpdir/tmp.svg" "$tmpdir/tmp2.svg" "$tmpdir/tmp3.svg"
-
-mkdir "$tmpdir/Riot.iconset"
-cp "$tmpdir/16.png" "$tmpdir/Riot.iconset/icon_16x16.png"
-cp "$tmpdir/32.png" "$tmpdir/Riot.iconset/icon_16x16@2x.png"
-cp "$tmpdir/32.png" "$tmpdir/Riot.iconset/icon_32x32.png"
-cp "$tmpdir/64.png" "$tmpdir/Riot.iconset/icon_32x32@2x.png"
-cp "$tmpdir/128.png" "$tmpdir/Riot.iconset/icon_128x128.png"
-cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_128x128@2x.png"
-cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png"
-cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png"
-cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png"
-cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png"
-
-if [ -x "$(command -v iconutil)" ]; then
-  # available on macos
-  iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
-elif [ -x "$(command -v png2icns)" ]; then
-  # available on linux
-  # png2icns is more finicky about its input than iconutil
-  # 1. it doesn't support a 64x64 (aka 32x32@2x)
-  # 2. it doesn't like duplicates (128x128@2x == 256x256)
-  rm "$tmpdir/Riot.iconset/icon_128x128@2x.png"
-  rm "$tmpdir/Riot.iconset/icon_256x256@2x.png"
-  rm "$tmpdir/Riot.iconset/icon_16x16@2x.png"
-  rm "$tmpdir/Riot.iconset/icon_32x32@2x.png"
-  png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png
-else
-  echo "WARNING: Unsupported platform. Skipping icns build"
-fi
-
-cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png"
-cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png"
-cp "$tmpdir/72.png" "res/vector-icons/android-chrome-72x72.png"
-cp "$tmpdir/96.png" "res/vector-icons/android-chrome-96x96.png"
-cp "$tmpdir/144.png" "res/vector-icons/android-chrome-144x144.png"
-cp "$tmpdir/192.png" "res/vector-icons/android-chrome-192x192.png"
-cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon.png"
-cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-precomposed.png"
-cp "$tmpdir/57.png" "res/vector-icons/apple-touch-icon-57x57.png"
-cp "$tmpdir/60.png" "res/vector-icons/apple-touch-icon-60x60.png"
-cp "$tmpdir/72.png" "res/vector-icons/apple-touch-icon-72x72.png"
-cp "$tmpdir/76.png" "res/vector-icons/apple-touch-icon-76x76.png"
-cp "$tmpdir/114.png" "res/vector-icons/apple-touch-icon-114x114.png"
-cp "$tmpdir/120.png" "res/vector-icons/apple-touch-icon-120x120.png"
-cp "$tmpdir/144.png" "res/vector-icons/apple-touch-icon-144x144.png"
-cp "$tmpdir/152.png" "res/vector-icons/apple-touch-icon-152x152.png"
-cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-180x180.png"
-cp "$tmpdir/16.png" "res/vector-icons/favicon-16x16.png"
-cp "$tmpdir/32.png" "res/vector-icons/favicon-32x32.png"
-cp "$tmpdir/96.png" "res/vector-icons/favicon-96x96.png"
-cp "$tmpdir/70.png" "res/vector-icons/mstile-70x70.png"
-cp "$tmpdir/144.png" "res/vector-icons/mstile-144x144.png"
-cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png"
-cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png"
-cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png"
-cp "$tmpdir/180.png" "electron_app/img/riot.png"
-
-convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png"  "$tmpdir/256.png" "res/vector-icons/favicon.ico"
-
-cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico"
-cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico"
-
-# https://github.com/electron-userland/electron-builder/blob/3f97b86993d4ea5172e562b182230a194de0f621/src/targets/LinuxTargetHelper.ts#L127
-for i in 24 96 16 48 64 128 256 512
-do
-    cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png"
-done
-
-rm -r "$tmpdir"
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@ -32,7 +32,8 @@ type ElectronChannel =
    | "setBadgeCount"
    | "update-downloaded"
    | "userDownloadCompleted"
-    | "userDownloadAction";
+    | "userDownloadAction"
+    | "openDesktopCapturerSourcePicker";

 declare global {
    interface Window {
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@ -5,7 +5,6 @@
    "Create Account": "أنشِئ حسابًا",
    "Explore rooms": "استكشِف الغرف",
    "Sign In": "لِج",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "الضبط غير صالح: يمكنك تحديد واحدًا من الآتي فقط: default_server_config أو default_server_name أو default_hs_url.",
    "Invalid configuration: no default server specified.": "الضبط غير صالح: لم تحدّد خادومًا مبدئيًا.",
    "Your Element is misconfigured": "لم يُضبط تطبيق Element كما ينبغي",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "يحتوي ضبط تطبيق Element على تنسيق JSON غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.",
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@ -5,7 +5,6 @@
    "Create Account": "Hesab Aç",
    "Explore rooms": "Otaqları kəşf edin",
    "Unexpected error preparing the app. See console for details.": "Tətbiqin başladılmasında gözlənilməz xəta.Təfərrüatlar üçün konsola baxın.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: bunlardan yalnız birini təyin edin - default_server_config, default_server_name, və ya default_hs_url.",
    "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: standart server göstərilməyib.",
    "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s",
    "Dismiss": "Nəzərə almayın",
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@ -6,7 +6,6 @@
    "Create Account": "Създай профил",
    "Explore rooms": "Открий стаи",
    "Unexpected error preparing the app. See console for details.": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невалидна конфигурация: може да е указано само едно от: default_server_config, default_server_name, или default_hs_url.",
    "Invalid configuration: no default server specified.": "Невалидна конфигурация: не е указан сървър по подразбиране.",
    "The message from the parser is: %(message)s": "Грешката от парсъра е: %(message)s",
    "Invalid JSON": "Невалиден JSON",
--- a/src/i18n/strings/bn_BD.json
+++ b/src/i18n/strings/bn_BD.json
@ -1,3 +1 @@
-{
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ভুল পছন্দসমূহ: এগয়লোর যেকোনো একটি কেবল নির্দিষ্ট করা যাবে default_server_config, default_server_name বা default_hs_url।"
-}
+{}
--- a/src/i18n/strings/bn_IN.json
+++ b/src/i18n/strings/bn_IN.json
@ -1,5 +1,4 @@
 {
    "Your Element is misconfigured": "আপনার এলিমেন্ট টি ভুল ভাবে কনফিগার করা হয়েছে",
-    "Invalid configuration: no default server specified.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ভুল কনফিগারেশনঃ এদের মধ্যে কেবলমাত্র একটাই উল্লেখ করা যেতে পারেঃ default_server_config, default_server_name অথবা default_hs_url."
+    "Invalid configuration: no default server specified.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।"
 }
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@ -1,5 +1,4 @@
 {
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neispravna konfiguracija: navesti se samo može jedan od default_server_config, default_server_name ili default_hs_url.",
    "Invalid configuration: no default server specified.": "Neispravna konfiguracija: nije naveden zadani server.",
    "Your Element is misconfigured": "Vaš element je pogrešno konfiguriran",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracija vašeg elementa sadrži nevažeći JSON. Ispravite problem i ponovo učitajte stranicu.",
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@ -8,7 +8,6 @@
    "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.",
    "Invalid JSON": "JSON invàlid",
    "Go to your browser to complete Sign In": "Vés al navegador per completar l'inici de sessió",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una únic default_server_config, default_server_name, o default_hs_url.",
    "Your Element is misconfigured": "Element està mal configurat",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Soluciona el problema i actualitza la pàgina.",
    "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s",
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "Zpráva z parseru je: %(message)s",
    "Invalid JSON": "Neplatný JSON",
    "Unexpected error preparing the app. See console for details.": "Neočekávaná chyba při přípravě aplikace. Podrobnosti najdete v konzoli.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurace: je možné specifikovat pouze jednu volbu z default_server_config, default_server_name, nebo default_hs_url.",
    "Invalid configuration: no default server specified.": "Neplatná konfigurace: není zadán výchozí server.",
    "Go to your browser to complete Sign In": "Přejděte do prohlížeče a dokončete přihlášení",
    "Your Element is misconfigured": "Váš Element je nesprávně nastaven",
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@ -2,7 +2,6 @@
    "The message from the parser is: %(message)s": "Y neges gan y dosrannudd yn: %(message)s",
    "Invalid JSON": "JSON annilys",
    "Unexpected error preparing the app. See console for details.": "Gwall annisgwyl wrth baratoi'r app. Gweler y consol am fanylion.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Gosodiad annilys: dim ond un o default_server_config, default_server_name, neu default_hs_url y gall ei nodi.",
    "Invalid configuration: no default server specified.": "Gosodiad annilys: ni nodwyd gweinydd diofyn.",
    "Unknown device": "Dyfais anhysbys",
    "Dismiss": "Wfftio",
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@ -5,7 +5,6 @@
    "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s",
    "Invalid JSON": "Ugyldig JSON",
    "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.",
    "Invalid configuration: no default server specified.": "Ugyldig konfiguration: Ingen standardserver er angivet.",
    "Sign In": "Log ind",
    "Create Account": "Opret brugerkonto",
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@ -6,7 +6,6 @@
    "Create Account": "Konto erstellen",
    "Explore rooms": "Räume erkunden",
    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App; mehr Details in der Konsole.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
    "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
    "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s",
    "Invalid JSON": "Ungültiges JSON",
@ -28,5 +27,6 @@
    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s auf %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Ungültige Konfiguration: default_hs_url kann nicht zeitgleich mit default_server_name oder default_server_config festgelegt werden"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@ -7,7 +7,6 @@
    "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s",
    "Invalid JSON": "Μη έγκυρο JSON",
    "Unexpected error preparing the app. See console for details.": "Απρόοπτο σφάλμα κατά την προετοιμασία της εφαρμογής. Δείτε το τερματικό για λεπτομέρειες.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Μη έγκυρη ρύθμιση: δυνατότητα ορισμού μόνο ένα από τα default_server_config, default_server_name, ή default_hs_url.",
    "Invalid configuration: no default server specified.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.",
    "Explore rooms": "Εξερευνήστε δωμάτια",
    "Open": "Άνοιγμα",
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@ -1,5 +1,5 @@
 {
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config",
    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
    "Your Element is misconfigured": "Your Element is misconfigured",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
    "Invalid JSON": "Invalid JSON",
    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
    "Failed to start": "Failed to start",
    "Go to element.io": "Go to element.io",
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@ -6,7 +6,6 @@
    "Create Account": "Krei konton",
    "Explore rooms": "Esplori ĉambrojn",
    "Unexpected error preparing the app. See console for details.": "Neatendita eraro okazis dum la preparado de la aplikaĵo. Rigardu la konzolon por detaloj.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nevalida agordo: vi povas specifi nur unu elekteblon el « default_server_config », « default_server_name », aŭ « default_hs_url ».",
    "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.",
    "The message from the parser is: %(message)s": "La mesaĝo el la analizilo estas: %(message)s",
    "Invalid JSON": "Nevalida JSON",
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@ -6,7 +6,6 @@
    "Create Account": "Crear cuenta",
    "Explore rooms": "Explorar salas",
    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Ver la consola para más detalles.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.",
    "The message from the parser is: %(message)s": "El mensaje del parser es: %(message)s",
    "Invalid JSON": "JSON inválido",
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@ -8,7 +8,6 @@
    "Go to your browser to complete Sign In": "Sisselogimiseks ava oma brauser",
    "Dismiss": "Loobu",
    "Explore rooms": "Tutvu jututubadega",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Vigane seadistus. Sa võid määrata vaid ühe alljärgnevatest: default_server_config, default_server_name või default_hs_url.",
    "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element",
    "Sign In": "Logi sisse",
    "Create Account": "Loo konto",
@ -28,5 +27,6 @@
    "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Vigane seadistus: default_hs_url ei saa olla määratud koos default_server_name või default_server_config tunnustega"
 }
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@ -7,7 +7,6 @@
    "Explore rooms": "Arakatu gelak",
    "Unexpected error preparing the app. See console for details.": "Ustekabeko errorea aplikazioa prestatzean. Ikusi xehetasunak kontsolan.",
    "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurazio baliogabea: default_server_config, default_server_name, edo default_hs_url bat bakarra zehaztu daiteke.",
    "The message from the parser is: %(message)s": "Prozesatzailearen mezua hau da: %(message)s",
    "Invalid JSON": "JSON baliogabea",
    "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko",
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@ -7,7 +7,6 @@
    "Sign In": "ورود",
    "Create Account": "ایجاد حساب کاربری",
    "Explore rooms": "جستجو در اتاق ها",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "پیکربندی نامعتبر: فقط میتوانید یکی از default_server_config، default_server_name یا default_hs_url را مشخص کنید.",
    "Invalid configuration: no default server specified.": "پیکربندی نامعتبر: سرور پیشفرض مشخص نشده است.",
    "Your Element is misconfigured": "Element شما پیکربندی نشده است",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "پیکربندی المنت شما شامل JSON نا معتبر است. لطفا مشکل را اصلاح کنید و صفحه را بارگذاری مجدد کنید.",
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@ -6,7 +6,6 @@
    "Create Account": "Luo tili",
    "Explore rooms": "Selaa huoneita",
    "Unexpected error preparing the app. See console for details.": "Odottamaton virhe sovellusta valmisteltaessa. Katso konsolista lisätietoja.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Virheellinen asetus. Vain yhden seuraavista voi määrittää: default_server_config, default_server_name, tai default_hs_url.",
    "Invalid configuration: no default server specified.": "Virheellinen asetus: oletuspalvelinta ei ole määritetty.",
    "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s",
    "Invalid JSON": "Virheellinen JSON",
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@ -6,7 +6,6 @@
    "Create Account": "Créer un compte",
    "Explore rooms": "Parcourir les salons",
    "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmi default_server_config, default_server_name et default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut indiqué.",
    "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s",
    "Invalid JSON": "JSON non valide",
@ -28,5 +27,6 @@
    "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s : %(browserName)s pour %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Configuration invalide : default_hs_url ne peut pas être défini en même temps que default_server_name ou default_server_config"
 }
--- a/src/i18n/strings/fy.json
+++ b/src/i18n/strings/fy.json
@ -24,6 +24,5 @@
    "Open": "Iepenje",
    "Invalid JSON": "Unjildige JSON",
    "Your Element is misconfigured": "Jo Element is net goed konfigurearre",
-    "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Unjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url."
+    "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre."
 }
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@ -21,7 +21,6 @@
    "Invalid JSON": "JSON neamhbhailí",
    "The message from the parser is: %(message)s": "Is í an teachtaireacht as an parsálaí: %(message)s",
    "Invalid configuration: no default server specified.": "Cumraíocht neamhbhailí: Níl aon freastalaí réamhshocraithe a sonrú.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Cumraíocht neamhbhailí: ní féidir ach ceann de default_server_config, default_server_name, nó default_hs_url a shonrú.",
    "Powered by Matrix": "Cumhachtaithe ag Matrix",
    "Go to element.io": "Téigh go element.io",
    "Open": "Oscail",
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "A mensaxe desde o intérprete é: %(message)s",
    "Invalid JSON": "JSON non válido",
    "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por defecto.",
    "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.",
    "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión",
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@ -3,7 +3,6 @@
    "Unknown device": "מכשיר לא ידוע",
    "Welcome to Element": "ברוכים הבאים ל Element",
    "Invalid JSON": "JSON לא חוקי",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהערכים הבאים, default_server_config, default_server_name, או default_hs_url.",
    "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
    "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
    "Explore rooms": "גלה חדרים",
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@ -5,7 +5,6 @@
    "Sign In": "साइन करना",
    "Create Account": "खाता बनाएं",
    "Explore rooms": "रूम का अन्वेषण करें",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।",
    "Failed to start": "प्रारंभ करने में विफल",
    "Go to element.io": "element.io पर जाएं",
    "I understand the risks and wish to continue": "मैं जोखिमों को समझता हूं और जारी रखना चाहता हूं",
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@ -6,7 +6,6 @@
    "Create Account": "Fiók létrehozása",
    "Explore rooms": "Szobák felderítése",
    "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért lásd a konzolt.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: ezek közül csak egyet lehet megadni: default_server_config, default_server_name és default_hs_url.",
    "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett kiszolgáló.",
    "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s",
    "Invalid JSON": "Érvénytelen JSON",
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@ -25,7 +25,6 @@
    "Invalid JSON": "JSON tidak absah",
    "The message from the parser is: %(message)s": "Pesan dari pengurai adalah: %(message)s",
    "Your Element is misconfigured": "Anda salah mengatur Element",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurasi tidak absah: hanya bisa menentukan satu dari default_server_config, default_server_name, atau default_hs_url.",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Obrolan &amp; kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s di %(osName)s",
    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@ -24,7 +24,6 @@
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element-stillingar þínar innihalda ógilt JSON. Leiðréttu vandamálið og endurlestu síðuna.",
    "Your Element is misconfigured": "Element-tilvikið þitt er rangt stillt",
    "Invalid configuration: no default server specified.": "Ógild uppsetning: enginn sjálfgefinn vefþjónn tilgreindur.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ógild uppsetning: getur aðeins tilgreint eitt af default_server_config, default_server_name eða default_hs_url.",
    "Use %(brand)s on mobile": "Nota %(brand)s í síma",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s á %(osName)s",
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@ -6,7 +6,6 @@
    "Create Account": "Crea account",
    "Explore rooms": "Esplora stanze",
    "Unexpected error preparing the app. See console for details.": "Errore inaspettato preparando l'app. Vedi la console per i dettagli.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurazione non valida: specificare solo uno di default_server_config, default_server_name, o default_hs_url.",
    "Invalid configuration: no default server specified.": "Configurazione non valida: nessun server predefinito specificato.",
    "The message from the parser is: %(message)s": "Il messaggio dal parser è: %(message)s",
    "Invalid JSON": "JSON non valido",
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@ -9,7 +9,6 @@
    "Explore rooms": "ルームを探す",
    "The message from the parser is: %(message)s": "パーサーのメッセージ：%(message)s",
    "Invalid JSON": "不正なJSON",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "不正な設定：default_server_config、default_server_name、またはdefault_hs_urlのいずれか一つのみを指定できます。",
    "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>をインストールしてください。",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "現在のブラウザーを使い続けることもできますが、いくつか（もしくは全ての）機能が動作しなかったり、外観が崩れたりする可能性があります。",
    "I understand the risks and wish to continue": "リスクを理解して続行",
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@ -17,7 +17,6 @@
    "Sign In": "nu co'a jaspu",
    "Create Account": "nu pa re'u co'a jaspu",
    "Explore rooms": "nu facki le du'u ve zilbe'i",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": ".i le tcimi'e vreji na drani le ka jai do'e fai gi jo nai zoi zoi. default_server_config .zoi gi zoi zoi. default_server_name .zoi gi zoi zoi. default_hs_url .zoi cmene da",
    "Invalid configuration: no default server specified.": ".i le tcimi'e vreji na drani le ka jai do'e zmicu'a fo le ka samtcise'u",
    "Your Element is misconfigured": ".i le tcimi'e be la .elyment. be'o vreji na drani",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": ".i le tcimi'e be la .elyment. be'o vreji na drani le ka veirdjeisano .i gau ko drani je ba kibycpa le kibypapri",
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@ -27,6 +27,5 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s იყენებს ბრაუზერის გაფართოებულ ფუნქციებს, რომლებიც არ არის მხარდაჭერილი თქვენი ამჟამინდელი ბრაუზერის მიერ.",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s %(osName)s-ზე",
    "%(brand)s Desktop: %(platformName)s": "%(brand)s სამუშაო მაგიდა: %(platformName)s",
-    "The message from the parser is: %(message)s": "პარსერის შეტყობინებაა: %(message)s",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "არასწორი კონფიგურაცია: შეიძლება მიუთითოთ მხოლოდ ერთი default_server_config, default_server_name ან default_hs_url."
+    "The message from the parser is: %(message)s": "პარსერის შეტყობინებაა: %(message)s"
 }
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@ -6,7 +6,6 @@
    "Dismiss": "Agwi",
    "Sign In": "Kcem",
    "Explore rooms": "Snirem tixxamin",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Tawila d tarmeɣtut: mudd-d kan yiwen seg default_server_config, default_server_name, neɣ default_hs_url.",
    "Invalid configuration: no default server specified.": "Tawila d tarmeɣtut: ulac aqeddac amezwer i d-yettwafernen.",
    "The message from the parser is: %(message)s": "Izen n umaslaḍ d: %(message)s",
    "Unable to load config file: please refresh the page to try again.": "Yegguma ad d-yali ufaylu n twila: ma ulac aɣilif smiren asebter akken ad tεerḍeḍ tikkelt-nniḍen.",
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@ -5,7 +5,6 @@
    "The message from the parser is: %(message)s": "파서에서 온 메시지: %(message)s",
    "Invalid JSON": "유효하지 않은 JSON",
    "Unexpected error preparing the app. See console for details.": "앱을 준비하는 동안 예기치 않은 오류가 발생했습니다. 자세한 내용은 콘솔을 확인하세요.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "잘못된 설정: default_server_config 와 defalut_server_name, default_hs_url 중 하나만 지정할 수 있습니다.",
    "Invalid configuration: no default server specified.": "잘못된 설정: 기본 서버가 지정되지 않았습니다.",
    "Sign In": "로그인",
    "Create Account": "계정 만들기",
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@ -25,6 +25,5 @@
    "The message from the parser is: %(message)s": "ຂໍ້ຄວາມຈາກຕົວປ່ຽນແມ່ນ: %(message)s",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານມີຄ່າ JSON ທີ່ບໍ່ຖືກຕ້ອງ. ກະລຸນາແກ້ໄຂບັນຫາ ແລະໂຫຼດໜ້ານີ້ຄືນໃໝ່.",
    "Your Element is misconfigured": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານບໍ່ຖືກຕ້ອງ",
-    "Invalid configuration: no default server specified.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ສາມາດລະບຸໄດ້ພຽງແຕ່ອັນດຽວຂອງ default_server_config, default_server_name, or default_hs_url."
+    "Invalid configuration: no default server specified.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ."
 }
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s",
    "Invalid JSON": "Klaidingas JSON",
    "Unexpected error preparing the app. See console for details.": "Netikėta klaida ruošiant programą. Norėdami sužinoti daugiau detalių, žiūrėkite konsolę.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Klaidinga konfigūracija: galima nurodyti tik vieną iš default_server_config, default_server_name, arba default_hs_url.",
    "Invalid configuration: no default server specified.": "Klaidinga konfigūracija: nenurodytas numatytasis serveris.",
    "Go to your browser to complete Sign In": "Norėdami užbaigti prisijungimą, eikite į naršyklę",
    "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.",
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@ -1,30 +1,31 @@
 {
    "Dismiss": "Aizvērt",
    "Unknown device": "Nezināma ierīce",
-    "Welcome to Element": "Esiet laipni gaidīti Elementā",
-    "Sign In": "Ierakstīties",
+    "Welcome to Element": "Laipni lūdzam Element!",
+    "Sign In": "Pieteikties",
    "Create Account": "Izveidot kontu",
    "Explore rooms": "Pārlūkot istabas",
-    "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Kļūdaina konfigurācija: var norādīt tikai vienu no parametriem default_server_config, default_server_name, vai default_hs_url.",
-    "Invalid configuration: no default server specified.": "Kļūdaina konfigurācija: nav norādīts noklusējuma serveris.",
-    "The message from the parser is: %(message)s": "No pārsētāja ir ziņa: %(message)s",
-    "Invalid JSON": "Kļūdains JSON",
-    "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt konfigurācijas failu. Lai atkārtotu mēģinātu, lūdzu pārlādējiet lapu.",
-    "Go to your browser to complete Sign In": "Dodieties uz pārlūku, lai pabeigtu pierakstīšanos",
+    "Unexpected error preparing the app. See console for details.": "Lietotnes sagatavošanā gadījās negaidīta kļūda. Izvērsums ir atrodams konsolē.",
+    "Invalid configuration: no default server specified.": "Nederīga konfigurācija: nav norādīts noklusējuma serveris.",
+    "The message from the parser is: %(message)s": "Ziņa no pārsētāja ir: %(message)s",
+    "Invalid JSON": "Nederīgs JSON",
+    "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt konfigurācijas datni. Lūgums pārlādēt lapu, lai mēģinātu vēlreiz.",
+    "Go to your browser to complete Sign In": "Jādodas uz pārlūku, lai pabeigtu pieteikšanos",
    "Unsupported browser": "Neatbalstīts pārlūks",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Lai gūtu labāko lietošanas pieredzi, lūdzu, instalējiet <chromeLink>Chromium</chromeLink>, <firefoxLink>Firefox</firefoxLink> vai <safariLink>Safari</safariLink> pārlūku.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs varat turpināt lietot savu pašreizējo pārlūku, bet dažas funkcijas nestrādās un lietotnes izskats/saskarne var būt atspoguļoti nekorekti.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Lūgums uzstādīt <chromeLink>Chromium</chromeLink>, <firefoxLink>Firefox</firefoxLink> vai <safariLink>Safari</safariLink>, lai gūtu labāko lietošanas pieredzi.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Var turpināt izmantot savu pašreizējo pārlūku, bet dažas iespējas nedarbosies, un lietotnes izskats un saskarne var būt nepilnīga.",
    "I understand the risks and wish to continue": "Es apzinos riskus un vēlos turpināt",
    "Go to element.io": "Doties uz element.io",
    "Failed to start": "Neizdevās palaist",
-    "Powered by Matrix": "Griežas uz Matrix tehnoloģijas",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s izmanto pārlūku papildfunkcijas, kuras netiek atbalstītas šajā pārlūkā.",
-    "Your browser can't run %(brand)s": "Jūsu pārlūks nevar palaist %(brand)s",
+    "Powered by Matrix": "Darbina Matrix",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s izmanto pārlūku iespējas, kuras nav pieejamas šajā pārlūkā.",
+    "Your browser can't run %(brand)s": "Šajā pārlūkā nevar palaist %(brand)s",
    "Open": "Atvērt",
-    "Download Completed": "Lejuplāde pabeigta",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, izlabojiet un pārlādējiet lapu.",
-    "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini",
-    "Use %(brand)s on mobile": "Mobilajā tālrunī izmanojiet %(brand)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizēta, šifrēta saziņa &amp; sadarbība, ko nodrošina $matrixLogo"
+    "Download Completed": "Lejuplāde ir pabeigta",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element konfigurācija satur nederīgu JSON. Lūgums novērst kļūmi un pārlādēt lapu.",
+    "Your Element is misconfigured": "Element ir kļūdaini iestatīts",
+    "Use %(brand)s on mobile": "Viedtālrunī jāizmanto %(brand)s",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizēta, šifrēta saziņa un sadarbība, ko nodrošina $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s darbvirsma: %(platformName)s",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s %(osName)s"
 }
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@ -4,7 +4,6 @@
    "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 Element is misconfigured": "നിങ്ങളുടെ Element തെറ്റായിട്ടാണ് കോൺഫിഗർ ചെയ്തിരിക്കുന്നത്",
    "Invalid configuration: no default server specified.": "അസാധുവായ കോൺഫിഗറേഷൻ: സ്ഥിര സെർവർ ഒന്നും വ്യക്തമാക്കിയില്ല.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "അസാധുവായ കോൺഫിഗറേഷൻ: default_server_config, default_server_name, or default_hs_url-ൽ ഒരെണ്ണം മാത്രമേ വ്യക്തമാക്കാൻ കഴിയൂ.",
    "Download Completed": "ഡൗൺലോഡ് പൂർത്തിയായി",
    "Unsupported browser": "പിന്തുണയ്‌ക്കാത്ത ബ്രൗസർ",
    "I understand the risks and wish to continue": "ഞാൻ അപകടസാധ്യതകൾ മനസിലാക്കുകയും തുടരാൻ ആഗ്രഹിക്കുകയും ചെയ്യുന്നു",
--- a/src/i18n/strings/mn.json
+++ b/src/i18n/strings/mn.json
@ -2,7 +2,6 @@
    "The message from the parser is: %(message)s": "Парсераас ирсэн мессеж нь: %(message)s",
    "Invalid JSON": "Буруу ЖСОН",
    "Unexpected error preparing the app. See console for details.": "Апп бэлдэх үед гарах ёсгүй алдаа. Дэлгэрэнгүйг консолоос харна уу.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Буруу тохиргоо: default_server_config, default_server_name, эсвэл default_hs_url утгын зөвхөн аль нэгийг л зааж болно.",
    "Invalid configuration: no default server specified.": "Буруу тохиргоо: Өгөгдсөл серверийг зааж өгөөгүй байна.",
    "Unknown device": "Үл мэдэгдэх төхөөрөмж",
    "Dismiss": "Орхих",
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@ -9,7 +9,6 @@
    "Invalid JSON": "Ugyldig JSON",
    "Invalid configuration: no default server specified.": "Ugyldig konfigurasjon: ingen standardserver spesifisert.",
    "Unexpected error preparing the app. See console for details.": "Uventet feil ved klargjøring av appen. Se konsollen for detaljer.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfigurasjon: Spesifiser kun en av følgende: default_server_config, default_server_name eller default_hs_url.",
    "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen",
    "Failed to start": "Kunne ikke starte",
    "Go to element.io": "Gå til element.io",
--- a/src/i18n/strings/ne.json
+++ b/src/i18n/strings/ne.json
@ -25,6 +25,5 @@
    "The message from the parser is: %(message)s": "पार्सर का संदेश है: %(message)s",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "आपके एलीमेंट कॉन्फ़िगरेशन में अमान्य JSON है. कृपया समस्या को ठीक करें और पृष्ठ को पुनः लोड करें।",
    "Your Element is misconfigured": "आपका तत्व गलत कॉन्फ़िगर किया गया है",
-    "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।"
+    "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@ -6,7 +6,6 @@
    "Create Account": "Registreren",
    "Explore rooms": "Kamers ontdekken",
    "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
    "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
    "The message from the parser is: %(message)s": "De ontleder meldt: %(message)s",
    "Invalid JSON": "Ongeldige JSON",
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@ -8,8 +8,7 @@
    "The message from the parser is: %(message)s": "Meldinga frå kodetolkaren er: %(message)s",
    "Invalid JSON": "Ugyldig JSON",
    "Unexpected error preparing the app. See console for details.": "Uventa feil under lasting av programmet. Sjå konsollen for detaljar.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig oppsett: berre muleg å berre spesifiere ein av default_server_config, default_server_name eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardserver er spesifisert.",
+    "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardtener er spesifisert.",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Oppsettet for din Element inneheld ugyldig JSON. Sjekk konfigurasjonsfila, deretter last om sida.",
    "Unable to load config file: please refresh the page to try again.": "Fekk ikkje til å lasta konfigurasjonsfila: last inn sida for å prøva om att.",
    "Go to your browser to complete Sign In": "Opna nettlesaren din for å fullføra innlogginga",
@ -22,7 +21,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brukar avanserte nettlesarfunksjonar som ikkje er støtta av den gjeldande nettlesaren din.",
    "Use %(brand)s on mobile": "Bruk %(brand)s på mobil",
    "Powered by Matrix": "Driven av Matrix",
-    "Your Element is misconfigured": "Element er feilkonfigurert",
+    "Your Element is misconfigured": "Din Element-klient er sett opp feil",
    "Failed to start": "Klarte ikkje å starta",
    "Open": "Opna",
    "Download Completed": "Nedlasting Fullført",
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@ -10,7 +10,6 @@
    "Create Account": "Crear un compte",
    "Explore rooms": "Percórrer las salas",
    "Invalid configuration: no default server specified.": "Configuracion invalida : pas de servidor per defauta especificat.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuracion invalida : podètz unicament especifiar un champ entre default_server_config, default_server_name, o default_hs_url.",
    "Failed to start": "Se pòt pas lançar",
    "Go to element.io": "Anar vès element.io",
    "I understand the risks and wish to continue": "Comprène los risques e vòle contunhar",
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@ -1,5 +1,5 @@
 {
-    "Dismiss": "Zamknij",
+    "Dismiss": "Pomiń",
    "Unknown device": "Nieznane urządzenie",
    "Welcome to Element": "Witamy w Element",
    "Create Account": "Utwórz konto",
@ -8,21 +8,20 @@
    "The message from the parser is: %(message)s": "Wiadomość od parsera to: %(message)s",
    "Invalid JSON": "Błędny JSON",
    "Unexpected error preparing the app. See console for details.": "Niespodziewany błąd podczas przygotowywania aplikacji. Otwórz konsolę po szczegóły.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Błędna konfiguracja. Akceptowalne wartości to: default_server_config, default_server_name, default_hs_url.",
    "Invalid configuration: no default server specified.": "Błędna konfiguracja: nie wybrano domyślnego serwera.",
    "Go to your browser to complete Sign In": "Aby dokończyć proces rejestracji, przejdź do swojej przeglądarki",
-    "Unable to load config file: please refresh the page to try again.": "Nie udało się załadować pliku konfiguracyjnego: odśwież stronę aby spróbować ponownie.",
+    "Unable to load config file: please refresh the page to try again.": "Nie udało się załadować pliku konfiguracyjnego: odśwież stronę, aby spróbować ponownie.",
    "Unsupported browser": "Niewspierana przeglądarka",
    "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.",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Możesz kontynuować używając obecnej przeglądarki, lecz niektóre lub wszystkie funkcje mogą nie działać oraz wygląd aplikacji może być niepoprawny.",
    "I understand the risks and wish to continue": "Rozumiem ryzyko i chcę kontynuować",
    "Go to element.io": "Przejdź do element.io",
    "Failed to start": "Nie udało się wystartować",
-    "Download Completed": "Pobieranie Zakończone",
+    "Download Completed": "Pobieranie zakończone",
    "Open": "Otwórz",
    "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji które nie są dostępne w obecnej przeglądarce.",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Twoja konfiguracja Elementa zawiera niepoprawny JSON. Rozwiąż problem i odśwież stronę.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa funkcji zaawansowanych, które nie są dostępne w Twojej przeglądarce.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Twoja konfiguracja Elementa zawiera nieprawidłowy JSON. Rozwiąż problem i odśwież stronę.",
    "Your Element is misconfigured": "Twój Element jest nieprawidłowo skonfigurowany",
    "Powered by Matrix": "Zasilane przez Matrix",
    "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie",
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@ -5,7 +5,6 @@
    "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
    "Invalid JSON": "JSON inválido",
    "Unexpected error preparing the app. See console for details.": "Erro inesperado na preparação da aplicação. Veja a consola para mais detalhes.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar uma das default_server_config, default_server_name, ou default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.",
    "Sign In": "Iniciar sessão",
    "Create Account": "Criar conta",
@ -14,7 +13,7 @@
    "Open": "Abrir",
    "Download Completed": "Transferência concluída",
    "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.",
    "Your Element is misconfigured": "O Element está configurado incorretamente",
    "Powered by Matrix": "Desenvolvido por Matrix",
    "Go to element.io": "Visite element.io",
@ -23,8 +22,10 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para uma melhor experiência.",
    "Unsupported browser": "Browser não suportado",
    "Failed to start": "Erro ao iniciar",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funções avançadas que não são suportadas pelo teu atual browser.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funcionalidades avançadas que o seu Navegador actual não suporta.",
    "Your browser can't run %(brand)s": "O teu browser não consegue executar %(brand)s",
    "Use %(brand)s on mobile": "Usar %(brand)s no telemóvel",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado &amp; colaboração alimentada por $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado &amp; colaboração alimentada por $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s em %(osName)s"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
    "Invalid JSON": "JSON inválido",
    "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o app. Veja console para detalhes.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar um de default_server_config, default_server_name, ou default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuração inválida: nenhum servidor default especificado.",
    "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de configuração: por favor atualize a página para tentar de novo.",
    "Download Completed": "Download Concluído",
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@ -5,7 +5,6 @@
    "Sign In": "Autentifică-te",
    "Create Account": "Creează-ți Cont",
    "Explore rooms": "Explorează camerele",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurație invalidă: se poate specifica doar una dintre default_server_config, default_server_name, sau default_hs_url.",
    "Invalid JSON": "JSON invalid",
    "Unsupported browser": "Acest browser nu este suportat",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalați vă rog <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, sau <safariLink>Safari</safariLink> pentru cea mai bună experiență.",
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@ -6,7 +6,6 @@
    "Create Account": "Создать учётную запись",
    "Explore rooms": "Обзор комнат",
    "Unexpected error preparing the app. See console for details.": "Неожиданная ошибка при подготовке приложения. Подробности см. в консоли.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: можно указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
    "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.",
    "The message from the parser is: %(message)s": "Сообщение из парсера: %(message)s",
    "Invalid JSON": "Неверный JSON",
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@ -16,7 +16,6 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "ඔබගේ වත්මන් අතිරික්සුව සහාය නොදක්වන උසස් විශේෂාංග %(brand)s භාවිත කරයි.",
    "The message from the parser is: %(message)s": "විග්‍රහය වෙතින් පණිවිඩය: %(message)s",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "ඔබගේ ඉලෙමන්ට් වින්‍යාසයෙහි වැරදි JSON අඩංගුය. ගැටලුව නිවැරදි කර පිටුව නැවුම් කරන්න.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "වින්‍යාසය වැරදිය: default_server_config, default_server_name, හෝ default_hs_url න් එකක් සඳහන් කළ හැකිය.",
    "Invalid configuration: no default server specified.": "වින්‍යාසය වලංගු නොවේ: පෙරනිමි සේවාදායකයක් දක්වා නැත.",
    "Your Element is misconfigured": "ඉලෙමන්ට් වැරදියට වින්‍යාසගතයි",
    "Unable to load config file: please refresh the page to try again.": "වින්‍යාස ගොනුව පූරණය කළ නොහැකිය: පිටුව නැවුම් කරන්න.",
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@ -9,7 +9,6 @@
    "Invalid JSON": "Neplatný JSON",
    "Unexpected error preparing the app. See console for details.": "Neočakávaná chyba počas pripravovania aplikácie. Pre podrobnosti pozri konzolu.",
    "Invalid configuration: no default server specified.": "Neplatné nastavenie: nebol určený východiskový server.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurácia: je možné špecifikovať len jednu možnosť z default_server_config, default_server_name, alebo default_hs_url.",
    "Unable to load config file: please refresh the page to try again.": "Nemožno načítať konfiguračný súbor: prosím obnovte stránku a skúste to znova.",
    "Go to your browser to complete Sign In": "Prejdite do prehliadača a dokončite prihlásenie",
    "Unsupported browser": "Nepodporovaný prehliadač",
@ -17,15 +16,15 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Môžete naďalej používať váš súčasný prehliadač, ale niektoré alebo všetky funkcie nemusia fungovať a zážitok z aplikácie nemusí byť optimálny.",
    "I understand the risks and wish to continue": "Rozumiem riziku a chcem pokračovať",
    "Go to element.io": "Prejsť na element.io",
-    "Failed to start": "Zapnutie zlyhalo",
+    "Failed to start": "Spustenie zlyhalo",
    "Download Completed": "Preberanie dokončené",
    "Open": "Otvoriť",
    "Your Element is misconfigured": "Váš Element je nesprávne nastavený",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávny údaj JSON. Prosím, opravte chybu a obnovte stránku.",
-    "Your browser can't run %(brand)s": "Váš prehliadač nerozbehne %(brand)s",
+    "Your browser can't run %(brand)s": "Váš prehliadač nedokáže spustiť %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.",
    "Powered by Matrix": "používa protokol Matrix",
-    "Use %(brand)s on mobile": "Používať %(brand)s pri mobilných zariadeniach",
+    "Use %(brand)s on mobile": "Používať %(brand)s na mobilnom zariadení",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
    "%(brand)s Desktop: %(platformName)s": "%(brand)s Stolný počítač: %(platformName)s"
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@ -5,7 +5,6 @@
    "Sign In": "Prijava",
    "Create Account": "Registracija",
    "Explore rooms": "Raziščite sobe",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.",
    "Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.",
    "Your Element is misconfigured": "Vaš Element je napačno nastavljen",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracije vašega Elementa vsebujejo neveljaven JSON. Prosim, popravite napako in znova naložite stran.",
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@ -6,7 +6,6 @@
    "Create Account": "Krijoni Llogari",
    "Explore rooms": "Eksploroni dhoma",
    "Unexpected error preparing the app. See console for details.": "Gabim i papritur gjatë përgatitjes së aplikacionit. Për hollësi, shihni konsolën.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Formësim i pavlefshëm: mund të caktohet vetëm një prej default_server_config, default_server_name, ose default_hs_url.",
    "Invalid configuration: no default server specified.": "Formësim i pavlefshëm: s’është caktuar shërbyes parazgjedhje.",
    "The message from the parser is: %(message)s": "Mesazhi prej procesit është: %(message)s",
    "Invalid JSON": "JSON i pavlefshëm",
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@ -9,7 +9,6 @@
    "The message from the parser is: %(message)s": "Порука из парсера: %(message)s",
    "Invalid JSON": "Погрешан JSON",
    "Unexpected error preparing the app. See console for details.": "Неочекивана грешка приликом припреме апликације. Погледајте конзолу за више детаља.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Погрешно подешавање: можете навести само једну вредност од default_server_config, default_server_name, или default_hs_url.",
    "Your Element is misconfigured": "Ваша Елемент апликација је лоше подешена",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Подешавање ваше Елемент апликације садржи неисправни „JSON“. Поправите проблем па поново учитајте ову страницу.",
    "Unable to load config file: please refresh the page to try again.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.",
--- a/src/i18n/strings/sr_Latn.json
+++ b/src/i18n/strings/sr_Latn.json
@ -2,7 +2,6 @@
    "The message from the parser is: %(message)s": "Poruka iz parsera je: %(message)s",
    "Invalid JSON": "Pogrešan JSON",
    "Unexpected error preparing the app. See console for details.": "Neočekivana greška prilikom pripreme aplikacije. Pogledajte konzolu za više detalja.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Pogrešno podešavanje: možete navesti samo jednu vrednost od default_server_config, default_server_name, or default_hs_url.",
    "Invalid configuration: no default server specified.": "Pogrešno podešavanje: podrazumevani server nije naveden.",
    "Unknown device": "Nepoznat uređaj",
    "Dismiss": "Odbaci",
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "Meddelandet från parsern är: %(message)s",
    "Invalid JSON": "Ogiltig JSON",
    "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsolen för mer information.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogiltiga inställningar: det är enbart möjligt att specificera en default_config, default_server, eller default_hs_url.",
    "Invalid configuration: no default server specified.": "Ogiltiga inställningar: ingen standardserver specificerad.",
    "Go to your browser to complete Sign In": "Gå till din webbläsare för att slutföra inloggningen",
    "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: ladda om sidan för att försöka igen.",
--- a/src/i18n/strings/sw.json
+++ b/src/i18n/strings/sw.json
@ -0,0 +1,31 @@
+{
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Mipangilio wa Element yako una JSON batili. Tafadhali sahihisha tatizo na upakie upya ukurasa.",
+    "The message from the parser is: %(message)s": "Ujumbe kutoka kwa mchanganuzi ni: %(message)s",
+    "Invalid JSON": "JSON ni batili",
+    "Unable to load config file: please refresh the page to try again.": "Haiwezekani kupakia faili ya mipangilio: tafadhali pakia upya ukurasa ili kujaribu tena.",
+    "Unexpected error preparing the app. See console for details.": "Hitilafu isiyotarajiwa katika kuandaa programu. Tazama console kwa maelezo.",
+    "Download Completed": "Upakuaji Umekamilika",
+    "Open": "Fungua",
+    "Dismiss": "Sisitiza",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Kompyuta ya mezani: %(platformName)s",
+    "Go to your browser to complete Sign In": "Nenda kwenye kivinjari chako ili ukamilishe Ingia",
+    "Unknown device": "Kifaa kisichojulikana",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s kwenye%(osName)s",
+    "Powered by Matrix": "Inaendeshwa na Matrix",
+    "Use %(brand)s on mobile": "Tumia %(brand)s kwenye simu",
+    "Unsupported browser": "Kivinjari kisichotumika",
+    "Your browser can't run %(brand)s": "Kivinjari chako hakifanyi kazi %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s hutumia vipengele vya kina vya kivinjari ambavyo havitumiki kwenye kivinjari chako cha sasa.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Unaweza kuendelea kutumia kivinjari chako cha sasa, lakini baadhi au vipengele vyote vinaweza kutofanya kazi na muonekano na hisia ya programu inaweza kuwa si sahihi.",
+    "I understand the risks and wish to continue": "Ninaelewa hatari na ningependa kuendelea",
+    "Go to element.io": "Nenda kwenye element.io",
+    "Failed to start": "Imeshindwa kuanza",
+    "Welcome to Element": "Karibu katika Elementi",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Tafadhali sakinisha <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, au <safariLink>Safari</safariLink> kwa uzoefu bora zaidi.",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Ujumbe umesambazwa, nakufichwa &amp; ushirikiano unaoendeshwa na",
+    "Sign In": "Ingia",
+    "Create Account": "Tengeneza Akaunti",
+    "Explore rooms": "Tafuta nafasi",
+    "Invalid configuration: no default server specified.": "Mpangilio batili: hakuna seva chaguo-msingi iliyobainishwa.",
+    "Your Element is misconfigured": "Element yako imesanifiwa vibaya"
+}
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@ -5,7 +5,6 @@
    "The message from the parser is: %(message)s": "பாகுபடுத்தி அனுப்பிய செய்தி: %(message)s",
    "Invalid JSON": "தவறான JSON",
    "Unexpected error preparing the app. See console for details.": "பயன்பாட்டைத் தயார் செய்வதில் எதிர்பாராத பிழை. விவரங்களுக்கு console ஐப் பார்க்கவும்.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "தவறான உள்ளமைவு: default_server_config, default_server_name அல்லது default_hs_url இல் ஒன்றை மட்டுமே குறிப்பிட முடியும்.",
    "Invalid configuration: no default server specified.": "தவறான உள்ளமைவு: இயல்புநிலை சேவையகம் குறிப்பிடப்படவில்லை.",
    "Sign In": "உள்நுழைக",
    "Create Account": "உங்கள் கணக்கை துவங்குங்கள்",
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@ -27,6 +27,5 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "คุณสามารถใช้เบราว์เซอร์ปัจจุบันของคุณต่อไปได้ แต่คุณสมบัติบางอย่างหรือทั้งหมดอาจไม่ทำงาน และรูปลักษณ์ของแอปพลิเคชันอาจไม่ถูกต้อง.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s ใช้คุณลักษณะขั้นสูงของเบราว์เซอร์ซึ่งไม่รองรับโดยเบราว์เซอร์ปัจจุบันของคุณ.",
    "Use %(brand)s on mobile": "ใช้ %(brand)s บนมือถือ",
-    "Go to your browser to complete Sign In": "ไปที่เบราว์เซอร์ของคุณเพื่อลงชื่อเข้าใช้ให้เสร็จสมบูรณ์.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "การกำหนดค่าไม่ถูกต้อง: สามารถระบุได้เพียงอย่างใดอย่างหนึ่ง default_server_config, default_server_name, or default_hs_url."
+    "Go to your browser to complete Sign In": "ไปที่เบราว์เซอร์ของคุณเพื่อลงชื่อเข้าใช้ให้เสร็จสมบูรณ์."
 }
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@ -7,7 +7,6 @@
    "Explore rooms": "Odaları keşfet",
    "Invalid JSON": "Hatalı JSON",
    "Unexpected error preparing the app. See console for details.": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Hatalı ayarlar: default_server_config, default_server_name ve default_hs_url ayarlarından en fazla biri girilebilir.",
    "Invalid configuration: no default server specified.": "Hatalı ayarlar: varsayılan sunucu belirlenmemiş.",
    "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s",
    "Go to your browser to complete Sign In": "Oturum açmayı tamamlamak için tarayıcınıza gidin",
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@ -6,7 +6,6 @@
    "Create Account": "Створити обліковий запис",
    "Explore rooms": "Каталог кімнат",
    "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.",
    "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.",
    "The message from the parser is: %(message)s": "Повідомлення від аналізатора : %(message)s",
    "Invalid JSON": "Хибний JSON",
@ -28,5 +27,6 @@
    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Неправильна конфігурація: не можна вказати default_hs_url разом з default_server_name або default_server_config"
 }
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@ -5,15 +5,14 @@
    "Unexpected error preparing the app. See console for details.": "Có lỗi xảy ra trong lúc thiết lập ứng dụng. Mở bảng điều khiển (console) để biết chi tiết.",
    "The message from the parser is: %(message)s": "Thông báo của trình xử lý là: %(message)s",
    "Invalid JSON": "JSON không hợp lệ",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Thiết lập không hợp lệ: chỉ có thể điền một trong số sau default_server_config, default_server_name, hoặc default_hs_url.",
-    "Invalid configuration: no default server specified.": "Cấu hình không hợp lệ: chưa chỉ định máy chủ mặc định.",
+    "Invalid configuration: no default server specified.": "Thiết lập không hợp lệ: chưa chỉ định máy chủ mặc định.",
    "Sign In": "Đăng nhập",
    "Create Account": "Tạo tài khoản",
-    "Explore rooms": "Khám phá phòng chat",
+    "Explore rooms": "Khám phá các phòng",
    "Download Completed": "Tải xuống hoàn tất",
-    "Go to element.io": "Đi đến element.io",
-    "I understand the risks and wish to continue": "Tôi hiểu các rủi ro và muốn tiếp tục",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Bạn có thể tiếp tục sử dụng trình duyệt hiện tại, tuy nhiên một số hoặc tất cả tính năng có thể sẽ không hoạt động và trải nghiệm ứng dụng có thể sẽ không được tốt.",
+    "Go to element.io": "Qua element.io",
+    "I understand the risks and wish to continue": "Tôi hiểu rủi ro và muốn tiếp tục",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Bạn có thể tiếp tục sử dụng trình duyệt hiện tại, tuy nhiên các tính năng có thể sẽ không hoạt động và trải nghiệm ứng dụng có thể sẽ không được tốt.",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Hãy cài đặt <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, hoặc <safariLink>Safari</safariLink> để có trải nghiệm tốt nhất.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s sử dụng một số tính năng nâng cao mà trình duyệt của bạn không thể đáp ứng.",
    "Your browser can't run %(brand)s": "Trình duyệt của bạn không thể chạy %(brand)s",
@ -21,10 +20,12 @@
    "Go to your browser to complete Sign In": "Mở trình duyệt web để hoàn thành đăng nhập",
    "Open": "Mở",
    "Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy tải lại trang để thử lại.",
-    "Failed to start": "Khởi động thất bại",
+    "Failed to start": "Không khởi động được",
    "Use %(brand)s on mobile": "Sử dụng %(brand)s trên di động",
-    "Powered by Matrix": "Được chạy trên giao thức Matrix",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn chứa JSON không hợp lệ. Vui lòng sửa vấn đề và tải lại trang.",
-    "Your Element is misconfigured": "Element của bạn bị thiết lập sai",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dịch vụ chat &amp; liên lạc đã được mã hóa, phi tập trung. Được cung cấp bởi $matrixLogo"
+    "Powered by Matrix": "Chạy trên giao thức Matrix",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn đang chứa mã JSON không hợp lệ. Vui lòng sửa lại và tải lại trang.",
+    "Your Element is misconfigured": "Element đang bị thiết lập sai",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dịch vụ nhắn tin &amp; liên lạc được mã hóa, phi tập trung. Được vận hành trên $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s trên %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s máy tính: %(platformName)s"
 }
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@ -1,6 +1,5 @@
 {
    "Unexpected error preparing the app. See console for details.": "’t Is een onverwachte foute ipgetreedn by ’t voorbereidn van den app. Bekykt de console vo details.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroasje: ku moar één van default_server_config, default_server_name, of default_hs_url ingeevn.",
    "Invalid configuration: no default server specified.": "Oungeldige configuroasje: geen standoardserver ingegeevn.",
    "Unknown device": "Ounbekend toestel",
    "Dismiss": "Afwyzn",
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@ -8,7 +8,6 @@
    "The message from the parser is: %(message)s": "来自解析器的消息：%(message)s",
    "Invalid JSON": "无效的 JSON",
    "Unexpected error preparing the app. See console for details.": "准备软件时出现意外错误，详细信息请查看控制台。",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "配置无效：只能指定default_server_config、default_server_name或default_hs_url其中之一。",
    "Invalid configuration: no default server specified.": "配置无效：没有指定默认服务器。",
    "Unable to load config file: please refresh the page to try again.": "无法加载配置文件：请刷新页面以重试。",
    "Go to your browser to complete Sign In": "转到您的浏览器以完成登录",
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@ -6,7 +6,6 @@
    "Create Account": "建立帳號",
    "Explore rooms": "探索聊天室",
    "Unexpected error preparing the app. See console for details.": "準備應用程式時發生未知錯誤。請見主控台以取得更多資訊。",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "無效設定：只能指定 default_server_config、default_server_name 或 default_hs_url 其中之一。",
    "Invalid configuration: no default server specified.": "無效設定：未指定預設伺服器。",
    "The message from the parser is: %(message)s": "解析器收到的訊息：%(message)s",
    "Invalid JSON": "無效的 JSON",
@ -28,5 +27,6 @@
    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "由 $matrixLogo 驅動的去中心化、加密的聊天與協作工具",
    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s：%(osName)s 的 %(browserName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "無效設定：default_hs_url 不能與 default_server_name 或 default_server_config 一起指定"
 }
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@ -38,7 +38,7 @@ import { QueryDict, encodeParams } from "matrix-js-sdk/src/utils";

 import { parseQs } from "./url_utils";
 import VectorBasePlatform from "./platform/VectorBasePlatform";
-import { getScreenFromLocation, init as initRouting, onNewScreen } from "./routing";
+import { getInitialScreenAfterLogin, getScreenFromLocation, init as initRouting, onNewScreen } from "./routing";

 // add React and ReactPerf to the global namespace, to make them easier to access via the console
 // this incidentally means we can forget our React imports in JSX files without penalty.
@ -75,13 +75,17 @@ function makeRegistrationUrl(params: QueryDict): string {

 function onTokenLoginCompleted(): void {
    // if we did a token login, we're now left with the token, hs and is
-    // url as query params in the url; a little nasty but let's redirect to
-    // clear them.
+    // url as query params in the url;
+    // if we did an oidc authorization code flow login, we're left with the auth code and state
+    // as query params in the url;
+    // a little nasty but let's redirect to clear them.
    const url = new URL(window.location.href);

    url.searchParams.delete("loginToken");
+    url.searchParams.delete("state");
+    url.searchParams.delete("code");

-    logger.log(`Redirecting to ${url.href} to drop loginToken from queryparams`);
+    logger.log(`Redirecting to ${url.href} to drop delegated authentication params from queryparams`);
    window.history.replaceState(null, "", url.href);
 }

@ -107,7 +111,8 @@ export async function loadApp(fragParams: {}): Promise<ReactElement> {
    const ssoRedirects = parseSsoRedirectOptions(config);
    let autoRedirect = ssoRedirects.immediate === true;
    // XXX: This path matching is a bit brittle, but better to do it early instead of in the app code.
-    const isWelcomeOrLanding = window.location.hash === "#/welcome" || window.location.hash === "#";
+    const isWelcomeOrLanding =
+        window.location.hash === "#/welcome" || window.location.hash === "#" || window.location.hash === "";
    if (!autoRedirect && ssoRedirects.on_welcome_page && isWelcomeOrLanding) {
        autoRedirect = true;
    }
@ -128,6 +133,8 @@ export async function loadApp(fragParams: {}): Promise<ReactElement> {
    const defaultDeviceName =
        snakedConfig.get("default_device_display_name") ?? platform?.getDefaultDeviceDisplayName();

+    const initialScreenAfterLogin = getInitialScreenAfterLogin(window.location);
+
    return (
        <MatrixChat
            onNewScreen={onNewScreen}
@ -137,7 +144,7 @@ export async function loadApp(fragParams: {}): Promise<ReactElement> {
            startingFragmentQueryParams={fragParams}
            enableGuest={!config.disable_guests}
            onTokenLoginCompleted={onTokenLoginCompleted}
-            initialScreenAfterLogin={getScreenFromLocation(window.location)}
+            initialScreenAfterLogin={initialScreenAfterLogin}
            defaultDeviceDisplayName={defaultDeviceName}
        />
    );
@ -164,11 +171,11 @@ async function verifyServerConfig(): Promise<IConfigOptions> {
        const isUrl = config["default_is_url"];

        const incompatibleOptions = [wkConfig, serverName, hsUrl].filter((i) => !!i);
-        if (incompatibleOptions.length > 1) {
+        if (hsUrl && (wkConfig || serverName)) {
            // noinspection ExceptionCaughtLocallyJS
            throw new UserFriendlyError(
-                "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
-                    "or default_hs_url.",
+                "Invalid configuration: a default_hs_url can't be specified along with default_server_name " +
+                    "or default_server_config",
            );
        }
        if (incompatibleOptions.length < 1) {
@ -196,7 +203,7 @@ async function verifyServerConfig(): Promise<IConfigOptions> {
        }

        let discoveryResult: ClientConfig | undefined;
-        if (wkConfig) {
+        if (!serverName && wkConfig) {
            logger.log("Config uses a default_server_config - validating object");
            discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig);
        }
@ -208,6 +215,10 @@ async function verifyServerConfig(): Promise<IConfigOptions> {
                    "use default_server_config instead.",
            );
            discoveryResult = await AutoDiscovery.findClientConfig(serverName);
+            if (discoveryResult["m.homeserver"].base_url === null && wkConfig) {
+                logger.log("Finding base_url failed but a default_server_config was found - using it as a fallback");
+                discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig);
+            }
        }

        validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
--- a/src/vector/getconfig.ts
+++ b/src/vector/getconfig.ts
@ -21,7 +21,13 @@ import type { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 export async function getVectorConfig(relativeLocation = ""): Promise<IConfigOptions | undefined> {
    if (relativeLocation !== "" && !relativeLocation.endsWith("/")) relativeLocation += "/";

-    const specificConfigPromise = getConfig(`${relativeLocation}config.${window.location.hostname}.json`);
+    // Handle trailing dot FQDNs
+    let domain = window.location.hostname.trimEnd();
+    if (domain[domain.length - 1] === ".") {
+        domain = domain.slice(0, -1);
+    }
+
+    const specificConfigPromise = getConfig(`${relativeLocation}config.${domain}.json`);
    const generalConfigPromise = getConfig(relativeLocation + "config.json");

    try {
--- a/src/vector/index.html
+++ b/src/vector/index.html
@ -28,7 +28,7 @@
        style-src 'self' 'unsafe-inline' <%= csp_extra_source %>;
        script-src 'self' 'wasm-unsafe-eval' https://www.recaptcha.net/recaptcha/ https://www.gstatic.com/recaptcha/ <%= csp_extra_source %>;
        img-src * blob: data:;
-        connect-src *;
+        connect-src * blob:;
        font-src 'self' data: <%= csp_extra_source %>;
        media-src * blob: data:;
        child-src * blob: data:;
@ -93,6 +93,10 @@
        <source src="media/busy.ogg" type="audio/ogg" />
        <source src="media/busy.mp3" type="audio/mpeg" />
    </audio>
+    <audio id="errorAudio">
+        <source src="media/error.ogg" type="audio/ogg" />
+        <source src="media/error.mp3" type="audio/mpeg" />
+    </audio>
    <audio id="remoteAudio"></audio>
    <!-- let CSS themes pass constants to the app -->
    <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@ -37,9 +37,40 @@ import type {
    AudioMuteStatusChangedEvent,
    LogEvent,
    VideoMuteStatusChangedEvent,
+    ExternalAPIOptions as _ExternalAPIOptions,
+    Config as _Config,
+    InterfaceConfig as _InterfaceConfig,
 } from "jitsi-meet";
 import { getVectorConfig } from "../getconfig";

+interface Config extends _Config {
+    // Jitsi's types are missing these fields
+    prejoinConfig?: {
+        enabled: boolean;
+        hideDisplayName?: boolean;
+        hideExtraJoinButtons?: string[];
+    };
+    toolbarButtons?: string[];
+    conferenceInfo?: {
+        alwaysVIsible?: string[];
+        autoHide?: string[];
+    };
+    disableSelfViewSettings?: boolean;
+}
+
+interface InterfaceConfig extends _InterfaceConfig {
+    // XXX: It is unclear whether this is a typo of TOOLBAR_BUTTONS or if its just really undocumented,
+    // either way it is missing in types, yet we try and use it
+    MAIN_TOOLBAR_BUTTONS?: string[];
+}
+
+interface ExternalAPIOptions extends _ExternalAPIOptions {
+    configOverwrite?: Config;
+    interfaceConfigOverwrite?: InterfaceConfig;
+    // Jitsi's types are missing these fields
+    lang?: string;
+}
+
 // We have to trick webpack into loading our CSS for us.
 require("./index.pcss");

@ -382,7 +413,7 @@ async function joinConference(audioInput?: string | null, videoInput?: string |
            "our fragment values and not recognizing the options.",
    );

-    const options = {
+    const options: ExternalAPIOptions = {
        width: "100%",
        height: "100%",
        parentNode: document.querySelector("#jitsiContainer") ?? undefined,
@ -421,20 +452,20 @@ async function joinConference(audioInput?: string | null, videoInput?: string |
    if (isVideoChannel) {
        // Ensure that we skip Jitsi Meet's native prejoin screen, for
        // deployments that have it enabled
-        options.configOverwrite.prejoinConfig = { enabled: false };
+        options.configOverwrite!.prejoinConfig = { enabled: false };
        // Use a simplified set of toolbar buttons
-        options.configOverwrite.toolbarButtons = ["microphone", "camera", "tileview", "hangup"];
+        options.configOverwrite!.toolbarButtons = ["microphone", "camera", "tileview", "hangup"];
        // Note: We can hide the screenshare button in video rooms but not in
        // normal conference calls, since in video rooms we control exactly what
        // set of controls appear, but in normal calls we need to leave that up
        // to the deployment's configuration.
        // https://github.com/vector-im/element-web/issues/4880#issuecomment-940002464
-        if (supportsScreensharing) options.configOverwrite.toolbarButtons.splice(2, 0, "desktop");
+        if (supportsScreensharing) options.configOverwrite!.toolbarButtons.splice(2, 0, "desktop");
        // Hide all top bar elements
-        options.configOverwrite.conferenceInfo = { autoHide: [] };
+        options.configOverwrite!.conferenceInfo = { autoHide: [] };
        // Remove the ability to hide your own tile, since we're hiding the
        // settings button which would be the only way to get it back
-        options.configOverwrite.disableSelfViewSettings = true;
+        options.configOverwrite!.disableSelfViewSettings = true;
    }

    meetApi = new JitsiMeetExternalAPI(jitsiDomain, options);
--- a/src/vector/mobile_guide/index.ts
+++ b/src/vector/mobile_guide/index.ts
@ -44,10 +44,10 @@ async function initPage(): Promise<void> {
    const defaultIsUrl = config?.["default_is_url"];

    const incompatibleOptions = [wkConfig, serverName, defaultHsUrl].filter((i) => !!i);
-    if (incompatibleOptions.length > 1) {
+    if (defaultHsUrl && (wkConfig || serverName)) {
        return renderConfigError(
-            "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
-                "or default_hs_url.",
+            "Invalid configuration: a default_hs_url can't be specified along with default_server_name " +
+                "or default_server_config",
        );
    }
    if (incompatibleOptions.length < 1) {
@ -57,7 +57,7 @@ async function initPage(): Promise<void> {
    let hsUrl: string | undefined;
    let isUrl: string | undefined;

-    if (typeof wkConfig?.["m.homeserver"]?.["base_url"] === "string") {
+    if (!serverName && typeof wkConfig?.["m.homeserver"]?.["base_url"] === "string") {
        hsUrl = wkConfig["m.homeserver"]["base_url"];

        if (typeof wkConfig["m.identity_server"]?.["base_url"] === "string") {
@ -78,8 +78,16 @@ async function initPage(): Promise<void> {
                }
            }
        } catch (e) {
-            logger.error(e);
-            return renderConfigError("Unable to fetch homeserver configuration");
+            if (wkConfig && wkConfig["m.homeserver"]) {
+                hsUrl = wkConfig["m.homeserver"]["base_url"] || undefined;
+
+                if (wkConfig["m.identity_server"]) {
+                    isUrl = wkConfig["m.identity_server"]["base_url"] || undefined;
+                }
+            } else {
+                logger.error(e);
+                return renderConfigError("Unable to fetch homeserver configuration");
+            }
        }
    }

--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@ -43,6 +43,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { BreadcrumbsStore } from "matrix-react-sdk/src/stores/BreadcrumbsStore";
 import { UPDATE_EVENT } from "matrix-react-sdk/src/stores/AsyncStore";
 import { avatarUrlForRoom, getInitialLetter } from "matrix-react-sdk/src/Avatar";
+import DesktopCapturerSourcePicker from "matrix-react-sdk/src/components/views/elements/DesktopCapturerSourcePicker";

 import VectorBasePlatform from "./VectorBasePlatform";
 import { SeshatIndexManager } from "./SeshatIndexManager";
@ -163,6 +164,14 @@ export default class ElectronPlatform extends VectorBasePlatform {
            });
        });

+        window.electron.on("openDesktopCapturerSourcePicker", () => {
+            const { finished } = Modal.createDialog(DesktopCapturerSourcePicker);
+            finished.then(([source]) => {
+                if (!source) return;
+                this.ipc.call("callDisplayMediaCallback", source);
+            });
+        });
+
        this.ipc.call("startSSOFlow", this.ssoID);

        BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@ -167,7 +167,7 @@ export default class WebPlatform extends VectorBasePlatform {
                logger.error("Failed to poll for update", err);
                return {
                    status: UpdateCheckStatus.Error,
-                    detail: err.message || err.status ? err.status.toString() : "Unknown Error",
+                    detail: err.message || (err.status ? err.status.toString() : "Unknown Error"),
                };
            },
        );
--- a/src/vector/rageshakesetup.ts
+++ b/src/vector/rageshakesetup.ts
@ -38,7 +38,8 @@ export function initRageshake(): Promise<void> {
        () => {
            logger.log("Initialised rageshake.");
            logger.log(
-                "To fix line numbers in Chrome: " + "Meatball menu → Settings → Ignore list → Add /rageshake\\.js$",
+                "To fix line numbers in Chrome: " +
+                    "Meatball menu → Settings → Ignore list → Add /rageshake\\.ts & /logger\\.ts$",
            );

            window.addEventListener("beforeunload", () => {
--- a/src/vector/routing.ts
+++ b/src/vector/routing.ts
@ -76,3 +76,36 @@ export function onNewScreen(screen: string, replaceLast = false): void {
 export function init(): void {
    window.addEventListener("hashchange", onHashChange);
 }
+
+const ScreenAfterLoginStorageKey = "mx_screen_after_login";
+function getStoredInitialScreenAfterLogin(): ReturnType<typeof getScreenFromLocation> | undefined {
+    const screenAfterLogin = sessionStorage.getItem(ScreenAfterLoginStorageKey);
+
+    return screenAfterLogin ? JSON.parse(screenAfterLogin) : undefined;
+}
+
+function setInitialScreenAfterLogin(screenAfterLogin?: ReturnType<typeof getScreenFromLocation>): void {
+    if (screenAfterLogin?.screen) {
+        sessionStorage.setItem(ScreenAfterLoginStorageKey, JSON.stringify(screenAfterLogin));
+    }
+}
+
+/**
+ * Get the initial screen to be displayed after login,
+ * for example when trying to view a room via a link before logging in
+ *
+ * If the current URL has a screen set that in session storage
+ * Then retrieve the screen from session storage and return it
+ * Using session storage allows us to remember login fragments from when returning from OIDC login
+ * @returns screen and params or undefined
+ */
+export function getInitialScreenAfterLogin(location: Location): ReturnType<typeof getScreenFromLocation> | undefined {
+    const screenAfterLogin = getScreenFromLocation(location);
+
+    if (screenAfterLogin.screen || screenAfterLogin.params) {
+        setInitialScreenAfterLogin(screenAfterLogin);
+    }
+
+    const storedScreenAfterLogin = getStoredInitialScreenAfterLogin();
+    return storedScreenAfterLogin;
+}
--- a/test/app-tests/loading-test.tsx
+++ b/test/app-tests/loading-test.tsx
@ -460,8 +460,8 @@ describe("loading:", function () {
                    httpBackend.verifyNoOutstandingExpectation();
                    expect(matrixChat?.container.querySelector(".mx_Welcome")).toBeTruthy();
                    expect(windowLocation?.hash).toEqual("#/welcome");
-                    expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
-                    expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
+                    expect(MatrixClientPeg.safeGet().baseUrl).toEqual(DEFAULT_HS_URL);
+                    expect(MatrixClientPeg.safeGet().idBaseUrl).toEqual(DEFAULT_IS_URL);
                });
        });

@ -592,6 +592,11 @@ describe("loading:", function () {

                    return tokenLoginCompletePromise;
                })
+                .then(() => {
+                    return expectAndAwaitSync().catch((e) => {
+                        throw new Error("Never got /sync after login: did the client start?");
+                    });
+                })
                .then(() => {
                    // check that the localstorage has been set up in such a way that
                    // the reloaded app can pick up where we leave off.
--- a/test/app-tests/server-config-test.ts
+++ b/test/app-tests/server-config-test.ts
@ -0,0 +1,79 @@
+/*
+Copyright 2023 Yorusaka Miyabi <shadowrz@disroot.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+import PlatformPeg from "matrix-react-sdk/src/PlatformPeg";
+import fetchMock from "fetch-mock-jest";
+
+import { loadApp } from "../../src/vector/app";
+import WebPlatform from "../../src/vector/platform/WebPlatform";
+
+fetchMock.config.overwriteRoutes = true;
+
+describe("Loading server config", function () {
+    beforeEach(async () => {
+        SdkConfig.reset();
+        PlatformPeg.set(new WebPlatform());
+        fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", {
+            unstable_features: {},
+            versions: [],
+        });
+        fetchMock.get("https://matrix.org/.well-known/matrix/client", {
+            "m.homeserver": {
+                base_url: "https://matrix-client.matrix.org",
+            },
+        });
+        fetchMock.get("/version", "1.10.13");
+    });
+
+    it("should use the default_server_config", async function () {
+        SdkConfig.put({
+            default_server_config: {
+                "m.homeserver": {
+                    base_url: "https://matrix-client.matrix.org",
+                },
+            },
+        });
+        await loadApp({});
+        expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org");
+    });
+
+    it("should use the default_server_name when resolveable", async function () {
+        SdkConfig.put({
+            default_server_name: "matrix.org",
+        });
+        await loadApp({});
+        expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org");
+    });
+
+    it(
+        "should not throw when both default_server_name and default_server_config is specified " +
+            "and default_server_name isn't resolvable",
+        async function () {
+            fetchMock.get("https://matrix.org/.well-known/matrix/client", 500);
+            SdkConfig.put({
+                default_server_name: "matrix.org",
+                default_server_config: {
+                    "m.homeserver": {
+                        base_url: "https://matrix-client.matrix.org",
+                    },
+                },
+            });
+            await loadApp({});
+            expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org");
+        },
+    );
+});
--- a/test/unit-tests/vector/platform/ElectronPlatform-test.ts
+++ b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
@ -21,6 +21,9 @@ import { Action } from "matrix-react-sdk/src/dispatcher/actions";
 import dispatcher from "matrix-react-sdk/src/dispatcher/dispatcher";
 import * as rageshake from "matrix-react-sdk/src/rageshake/rageshake";
 import { BreadcrumbsStore } from "matrix-react-sdk/src/stores/BreadcrumbsStore";
+import Modal from "matrix-react-sdk/src/Modal";
+import DesktopCapturerSourcePicker from "matrix-react-sdk/src/components/views/elements/DesktopCapturerSourcePicker";
+import { mocked } from "jest-mock";

 import ElectronPlatform from "../../../../src/vector/platform/ElectronPlatform";

@ -76,6 +79,35 @@ describe("ElectronPlatform", () => {
        expect(dispatchFireSpy).toHaveBeenCalledWith(Action.ViewUserSettings);
    });

+    it("creates a modal on openDesktopCapturerSourcePicker", async () => {
+        const plat = new ElectronPlatform();
+        Modal.createDialog = jest.fn();
+
+        // @ts-ignore mock
+        mocked(Modal.createDialog).mockReturnValue({
+            finished: new Promise((r) => r(["source"])),
+        });
+
+        let res: () => void;
+        const waitForIPCSend = new Promise<void>((r) => {
+            res = r;
+        });
+        // @ts-ignore mock
+        jest.spyOn(plat.ipc, "call").mockImplementation(() => {
+            res();
+        });
+
+        const [event, handler] = getElectronEventHandlerCall("openDesktopCapturerSourcePicker")!;
+        handler();
+
+        await waitForIPCSend;
+
+        expect(event).toBeTruthy();
+        expect(Modal.createDialog).toHaveBeenCalledWith(DesktopCapturerSourcePicker);
+        // @ts-ignore mock
+        expect(plat.ipc.call).toHaveBeenCalledWith("callDisplayMediaCallback", "source");
+    });
+
    describe("updates", () => {
        it("dispatches on check updates action", () => {
            new ElectronPlatform();
--- a/Show more
+++ b/Show more