Update .editorconfig

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ka/

Co-authored-by: Nicholas Winterhalter <gewinum@gmail.com>
Co-authored-by: Weblate <translate@riot.im>

.editorconfig

@@ -12,6 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 root = true
 
 [*]

.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

.github/workflows/backport.yml

@@ -23,7 +23,7 @@ jobs:
               )
             )
         steps:
-            - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2
+            - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2
               with:
                   labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
                   # We can't use GITHUB_TOKEN here or CI won't run on the new PR

.github/workflows/build_debian.yaml

@@ -0,0 +1,56 @@
+name: Build Debian package
+on:
+    release:
+        types: [published]
+concurrency: ${{ github.workflow }}
+jobs:
+    build:
+        name: Build package
+        if: github.event.release.prerelease == false
+        environment: packages.element.io
+        runs-on: ubuntu-latest
+        env:
+            R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
+            R2_URL: ${{ vars.CF_R2_S3_API }}
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Prepare
+              run: |
+                  mkdir -p /tmp/element-web-debian/DEBIAN
+                  cp -R debian/ /tmp/element-web-debian/DEBIAN/
+                  mkdir -p /tmp/element-web-debian/usr/share/element-web/
+
+                  wget https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz
+                  mv element-* /tmp/element-web-debian/usr/share/element-web
+                  mv debian/usr/share/element-web/config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json
+              env:
+                  VERSION: ${{ github.ref_name }}
+
+            - name: Build deb package
+              run: |
+                  VERSION=$(cat package.json | jq -r .version)
+                  chmod -R u=rw,go=r /tmp/element-web-debian/usr/share/element-web/
+                  dpkg-deb -Zxz --root-owner-group -VVersion=$VERSION --build /tmp/element-web-debian element-web.deb
+
+            # For now just upload the artifact to github
+            - uses: actions/upload-artifact@v3
+              with:
+                  name: debs
+                  path: "*.deb"
+                  retention-days: 14
+
+            #- name: Upload incoming deb
+            #  run: aws s3 cp element-io-archive-keyring.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto
+            #  env:
+            #      AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+            #      AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+
+    #reprepro:
+    #    needs: build
+    #    name: Run reprepro
+    #    if: inputs.deploy && github.event.release.prerelease == false
+    #    uses: ./.github/workflows/reprepro.yaml
+    #    secrets: inherit
+    #    with:
+    #        incoming: element-web.deb

.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@4c0219f9ac95b02789c1075625400b2acbff50b1 # 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@579f64ca0abced29dbbc44ab4c6a0b9e33ab3588 # v3
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}

.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@e752977e2cb4207d671bb9e4dad18c07c1b73d52 # v1.1.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

.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);

CHANGELOG.md

@@ -1,3 +1,193 @@
+Changes in [1.11.39](https://github.com/vector-im/element-web/releases/tag/v1.11.39) (2023-08-15)
+=================================================================================================
+
+## 🦖 Deprecations
+ * Deprecate camelCase config options ([\#25800](https://github.com/vector-im/element-web/pull/25800)).
+ * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733.
+
+## ✨ Features
+ * Update labs.md for knock rooms ([\#25923](https://github.com/vector-im/element-web/pull/25923)). Contributed by @charlynguyen.
+ * Package release builds of element-web in package.element.io debs ([\#25198](https://github.com/vector-im/element-web/pull/25198)).
+ * Allow knocking rooms ([\#11353](https://github.com/matrix-org/matrix-react-sdk/pull/11353)). Contributed by @charlynguyen.
+ * Support adding space-restricted joins on rooms not members of those spaces ([\#9017](https://github.com/matrix-org/matrix-react-sdk/pull/9017)). Fixes #19213.
+ * Clear requiresClient and show pop-out if widget-api fails to ready ([\#11321](https://github.com/matrix-org/matrix-react-sdk/pull/11321)). Fixes vector-im/customer-retainer#73.
+ * Bump pagination sizes due to hidden events ([\#11342](https://github.com/matrix-org/matrix-react-sdk/pull/11342)).
+ * Remove display of key backup signatures from backup settings ([\#11333](https://github.com/matrix-org/matrix-react-sdk/pull/11333)).
+ * Use PassphraseFields in ExportE2eKeysDialog to enforce minimum passphrase complexity ([\#11222](https://github.com/matrix-org/matrix-react-sdk/pull/11222)). Fixes #9478.
+
+## 🐛 Bug Fixes
+ * Fix "Export chat" not respecting configured time format in plain text mode ([\#10696](https://github.com/matrix-org/matrix-react-sdk/pull/10696)). Fixes #23838. Contributed by @rashmitpankhania.
+ * Fix some missing 1-count pluralisations around event list summaries ([\#11371](https://github.com/matrix-org/matrix-react-sdk/pull/11371)). Fixes #25925.
+ * Fix create subspace dialog not working for public space creation ([\#11367](https://github.com/matrix-org/matrix-react-sdk/pull/11367)). Fixes #25916.
+ * Search for users on paste ([\#11304](https://github.com/matrix-org/matrix-react-sdk/pull/11304)). Fixes #17523. Contributed by @peterscheu-aceart.
+ * Fix AppTile context menu not always showing up when it has options ([\#11358](https://github.com/matrix-org/matrix-react-sdk/pull/11358)). Fixes #25914.
+ * Fix clicking on home all rooms space notification not working ([\#11337](https://github.com/matrix-org/matrix-react-sdk/pull/11337)). Fixes #22844.
+ * Fix joining a suggested room switching space away ([\#11347](https://github.com/matrix-org/matrix-react-sdk/pull/11347)). Fixes #25838.
+ * Fix home/all rooms context menu in space panel ([\#11350](https://github.com/matrix-org/matrix-react-sdk/pull/11350)). Fixes #25896.
+ * Make keyboard handling in and out of autocomplete completions consistent ([\#11344](https://github.com/matrix-org/matrix-react-sdk/pull/11344)). Fixes #25878.
+ * De-duplicate reactions by sender to account for faulty/malicious servers ([\#11340](https://github.com/matrix-org/matrix-react-sdk/pull/11340)). Fixes #25872.
+ * Fix disable_3pid_login being ignored for the email field ([\#11335](https://github.com/matrix-org/matrix-react-sdk/pull/11335)). Fixes #25863.
+ * Upgrade wysiwyg editor for ctrl+backspace windows fix ([\#11324](https://github.com/matrix-org/matrix-react-sdk/pull/11324)). Fixes vector-im/verticals-internal#102.
+ * Unhide the view source event toggle - it works well enough ([\#11336](https://github.com/matrix-org/matrix-react-sdk/pull/11336)). Fixes #25861.
+
+Changes in [1.11.38](https://github.com/vector-im/element-web/releases/tag/v1.11.38) (2023-08-04)
+=================================================================================================
+
+## ✨ Features
+ * Package release builds of element-web in package.element.io debs ([\#25198](https://github.com/vector-im/element-web/pull/25198)).
+
+## 🐛 Bug Fixes
+ * Revert to using the /presence API for presence ([\#11366](https://github.com/matrix-org/matrix-react-sdk/pull/11366))
+
+Changes in [1.11.37](https://github.com/vector-im/element-web/releases/tag/v1.11.37) (2023-08-01)
+=================================================================================================
+
+## 🦖 Deprecations
+ * Deprecate camelCase config options ([\#25800](https://github.com/vector-im/element-web/pull/25800)).
+ * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733.
+
+## ✨ Features
+ * Do not show "Forget room" button in Room View header for guest users ([\#10898](https://github.com/matrix-org/matrix-react-sdk/pull/10898)). Contributed by @spantaleev.
+ * Switch to updating presence via /sync calls instead of PUT /presence ([\#11223](https://github.com/matrix-org/matrix-react-sdk/pull/11223)). Fixes #20809 #13877 and #4813.
+ * Fix blockquote colour contrast ([\#11299](https://github.com/matrix-org/matrix-react-sdk/pull/11299)). Fixes matrix-org/element-web-rageshakes#21800.
+ * Don't hide room header buttons in video rooms and rooms with a call ([\#9712](https://github.com/matrix-org/matrix-react-sdk/pull/9712)). Fixes #23900.
+ * OIDC: Persist details in session storage, create store ([\#11302](https://github.com/matrix-org/matrix-react-sdk/pull/11302)). Fixes #25710. Contributed by @kerryarchibald.
+ * Allow setting room join rule to knock ([\#11248](https://github.com/matrix-org/matrix-react-sdk/pull/11248)). Contributed by @charlynguyen.
+ * Retry joins on 524 (Cloudflare timeout) also ([\#11296](https://github.com/matrix-org/matrix-react-sdk/pull/11296)). Fixes #8776.
+ * Make sure users returned by the homeserver search API are displayed. Don't silently drop any. ([\#9556](https://github.com/matrix-org/matrix-react-sdk/pull/9556)). Fixes #24422. Contributed by @maxmalek.
+ * Offer to unban user during invite if inviter has sufficient permissions ([\#11256](https://github.com/matrix-org/matrix-react-sdk/pull/11256)). Fixes #3222.
+ * Split join and goto slash commands, the latter shouldn't auto_join ([\#11259](https://github.com/matrix-org/matrix-react-sdk/pull/11259)). Fixes #10128.
+ * Integration work for rich text editor 2.3.1 ([\#11172](https://github.com/matrix-org/matrix-react-sdk/pull/11172)). Contributed by @alunturner.
+ * Compound color pass ([\#11079](https://github.com/matrix-org/matrix-react-sdk/pull/11079)). Fixes vector-im/internal-planning#450 and #25547.
+ * Warn when demoting self via /op and /deop slash commands ([\#11214](https://github.com/matrix-org/matrix-react-sdk/pull/11214)). Fixes #13726.
+
+## 🐛 Bug Fixes
+ * Correct Jitsi preferred_domain property ([\#25813](https://github.com/vector-im/element-web/pull/25813)). Contributed by @benbz.
+ * Fix edge case with sent indicator being drawn when it shouldn't be ([\#11320](https://github.com/matrix-org/matrix-react-sdk/pull/11320)).
+ * Use correct translation function for WYSIWYG buttons ([\#11315](https://github.com/matrix-org/matrix-react-sdk/pull/11315)). Fixes vector-im/verticals-internal#109.
+ * Handle empty own profile ([\#11319](https://github.com/matrix-org/matrix-react-sdk/pull/11319)). Fixes #25510.
+ * Fix peeked rooms showing up in historical ([\#11316](https://github.com/matrix-org/matrix-react-sdk/pull/11316)). Fixes #22473.
+ * Ensure consistency when rendering the sent event indicator ([\#11314](https://github.com/matrix-org/matrix-react-sdk/pull/11314)). Fixes #17937.
+ * Prevent re-filtering user directory results in spotlight ([\#11290](https://github.com/matrix-org/matrix-react-sdk/pull/11290)). Fixes #24422.
+ * Fix GIF label on dark theme ([\#11312](https://github.com/matrix-org/matrix-react-sdk/pull/11312)). Fixes #25836.
+ * Fix issues around room notification settings flaking out ([\#11306](https://github.com/matrix-org/matrix-react-sdk/pull/11306)). Fixes #16472 #21309 and #6828.
+ * Fix invite dialog showing the same user multiple times ([\#11308](https://github.com/matrix-org/matrix-react-sdk/pull/11308)). Fixes #25578.
+ * Don't show composer send button if user cannot send ([\#11298](https://github.com/matrix-org/matrix-react-sdk/pull/11298)). Fixes #25825.
+ * Restore color for sender in imageview ([\#11289](https://github.com/matrix-org/matrix-react-sdk/pull/11289)). Fixes #25822.
+ * Fix changelog dialog heading size ([\#11286](https://github.com/matrix-org/matrix-react-sdk/pull/11286)). Fixes #25789.
+ * Restore offline presence badge color ([\#11287](https://github.com/matrix-org/matrix-react-sdk/pull/11287)). Fixes #25792.
+ * Fix bubble message layout avatar overlap ([\#11284](https://github.com/matrix-org/matrix-react-sdk/pull/11284)). Fixes #25818.
+ * Fix voice call tile size ([\#11285](https://github.com/matrix-org/matrix-react-sdk/pull/11285)). Fixes #25684.
+ * Fix layout of sessions tab buttons ([\#11279](https://github.com/matrix-org/matrix-react-sdk/pull/11279)). Fixes #25545.
+ * Don't bother showing redundant tooltip on space menu ([\#11276](https://github.com/matrix-org/matrix-react-sdk/pull/11276)). Fixes #20380.
+ * Remove reply fallback from notifications ([\#11278](https://github.com/matrix-org/matrix-react-sdk/pull/11278)). Fixes #17859.
+ * Populate info.duration for audio & video file uploads ([\#11225](https://github.com/matrix-org/matrix-react-sdk/pull/11225)). Fixes #17720.
+ * Hide widget menu button if it there are no options available ([\#11257](https://github.com/matrix-org/matrix-react-sdk/pull/11257)). Fixes #24826.
+ * Fix colour regressions ([\#11273](https://github.com/matrix-org/matrix-react-sdk/pull/11273)). Fixes #25788, #25808 #25811 and #25812.
+ * Fix room view not properly maintaining scroll position ([\#11274](https://github.com/matrix-org/matrix-react-sdk/pull/11274)). Fixes #25810.
+ * Prevent user from accidentally double clicking user info admin actions ([\#11254](https://github.com/matrix-org/matrix-react-sdk/pull/11254)). Fixes #10944.
+ * Fix missing metaspace notification badges ([\#11269](https://github.com/matrix-org/matrix-react-sdk/pull/11269)). Fixes #25679.
+ * Fix clicking MXID in timeline going to matrix.to ([\#11263](https://github.com/matrix-org/matrix-react-sdk/pull/11263)). Fixes #23342.
+ * Restoring optional ligatures by resetting letter-spacing ([\#11202](https://github.com/matrix-org/matrix-react-sdk/pull/11202)). Fixes #25727.
+ * Allow emoji presentation selector to not break BigEmoji styling ([\#11253](https://github.com/matrix-org/matrix-react-sdk/pull/11253)). Fixes #17848.
+ * Make event highliht use primary content token ([\#11255](https://github.com/matrix-org/matrix-react-sdk/pull/11255)).
+ * Fix event info events size and color ([\#11252](https://github.com/matrix-org/matrix-react-sdk/pull/11252)). Fixes #25778.
+ * Fix color mapping for blockquote border ([\#11251](https://github.com/matrix-org/matrix-react-sdk/pull/11251)). Fixes #25782.
+ * Strip emoji variation when searching emoji by emoji ([\#11221](https://github.com/matrix-org/matrix-react-sdk/pull/11221)). Fixes #18703.
+
+Changes in [1.11.36](https://github.com/vector-im/element-web/releases/tag/v1.11.36) (2023-07-18)
+=================================================================================================
+
+## 🔒 Security
+ * Fixes for [CVE-2023-37259](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-37259) / [GHSA-c9vx-2g7w-rp65](https://github.com/matrix-org/matrix-react-sdk/security/advisories/GHSA-c9vx-2g7w-rp65)
+
+## 🦖 Deprecations
+ * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733.
+
+## ✨ Features
+ * OIDC: store initial screen in session storage  ([\#25688](https://github.com/vector-im/element-web/pull/25688)). Fixes #25656. Contributed by @kerryarchibald.
+ * Allow default_server_config as a fallback config ([\#25682](https://github.com/vector-im/element-web/pull/25682)). Contributed by @ShadowRZ.
+ * OIDC: remove auth params from url after login attempt ([\#25664](https://github.com/vector-im/element-web/pull/25664)). Contributed by @kerryarchibald.
+ * feat(faq): remove keyboard shortcuts button ([\#9342](https://github.com/matrix-org/matrix-react-sdk/pull/9342)). Fixes #22625. Contributed by @gefgu.
+ * GYU: Update banner ([\#11211](https://github.com/matrix-org/matrix-react-sdk/pull/11211)). Fixes #25530. Contributed by @justjanne.
+ * Linkify mxc:// URLs as links to your media repo ([\#11213](https://github.com/matrix-org/matrix-react-sdk/pull/11213)). Fixes #6942.
+ * OIDC: Log in ([\#11199](https://github.com/matrix-org/matrix-react-sdk/pull/11199)). Fixes #25657. Contributed by @kerryarchibald.
+ * Handle all permitted url schemes in linkify ([\#11215](https://github.com/matrix-org/matrix-react-sdk/pull/11215)). Fixes #4457 and #8720.
+ * Autoapprove Element Call oidc requests ([\#11209](https://github.com/matrix-org/matrix-react-sdk/pull/11209)). Contributed by @toger5.
+ * Allow creating knock rooms ([\#11182](https://github.com/matrix-org/matrix-react-sdk/pull/11182)). Contributed by @charlynguyen.
+ * Expose and pre-populate thread ID in devtools dialog ([\#10953](https://github.com/matrix-org/matrix-react-sdk/pull/10953)).
+ * Hide URL preview if it will be empty ([\#9029](https://github.com/matrix-org/matrix-react-sdk/pull/9029)).
+ * Change wording from avatar to profile picture ([\#7015](https://github.com/matrix-org/matrix-react-sdk/pull/7015)). Fixes vector-im/element-meta#1331. Contributed by @aaronraimist.
+ * Quick and dirty devtool to explore state history ([\#11197](https://github.com/matrix-org/matrix-react-sdk/pull/11197)).
+ * Consider more user inputs when calculating zxcvbn score ([\#11180](https://github.com/matrix-org/matrix-react-sdk/pull/11180)).
+ * GYU: Account Notification Settings ([\#11008](https://github.com/matrix-org/matrix-react-sdk/pull/11008)). Fixes #24567. Contributed by @justjanne.
+ * Compound Typography pass ([\#11103](https://github.com/matrix-org/matrix-react-sdk/pull/11103)). Fixes #25548.
+ * OIDC: navigate to authorization endpoint ([\#11096](https://github.com/matrix-org/matrix-react-sdk/pull/11096)). Fixes #25574. Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Fix read receipt sending behaviour around thread roots ([\#3600](https://github.com/matrix-org/matrix-js-sdk/pull/3600)).
+ * Fix missing metaspace notification badges ([\#11269](https://github.com/matrix-org/matrix-react-sdk/pull/11269)). Fixes #25679.
+ * Make checkboxes less rounded ([\#11224](https://github.com/matrix-org/matrix-react-sdk/pull/11224)). Contributed by @andybalaam.
+ * GYU: Fix issues with audible keywords without activated mentions ([\#11218](https://github.com/matrix-org/matrix-react-sdk/pull/11218)). Contributed by @justjanne.
+ * PosthogAnalytics unwatch settings on logout ([\#11207](https://github.com/matrix-org/matrix-react-sdk/pull/11207)). Fixes #25703.
+ * Avoid trying to set room account data for pinned events as guest ([\#11216](https://github.com/matrix-org/matrix-react-sdk/pull/11216)). Fixes #6300.
+ * GYU: Disable sound for DMs checkbox when DM notifications are disabled ([\#11210](https://github.com/matrix-org/matrix-react-sdk/pull/11210)). Contributed by @justjanne.
+ * force to allow calls without video and audio in embedded mode ([\#11131](https://github.com/matrix-org/matrix-react-sdk/pull/11131)). Contributed by @EnricoSchw.
+ * Fix room tile text clipping ([\#11196](https://github.com/matrix-org/matrix-react-sdk/pull/11196)). Fixes #25718.
+ * Handle newlines in user pills ([\#11166](https://github.com/matrix-org/matrix-react-sdk/pull/11166)). Fixes #10994.
+ * Limit width of user menu in space panel ([\#11192](https://github.com/matrix-org/matrix-react-sdk/pull/11192)). Fixes #22627.
+ * Add isLocation to ComposerEvent analytics events ([\#11187](https://github.com/matrix-org/matrix-react-sdk/pull/11187)). Contributed by @andybalaam.
+ * Fix: hide unsupported login elements ([\#11185](https://github.com/matrix-org/matrix-react-sdk/pull/11185)). Fixes #25711. Contributed by @kerryarchibald.
+ * Scope smaller font size to user info panel ([\#11178](https://github.com/matrix-org/matrix-react-sdk/pull/11178)). Fixes #25683.
+ * Apply i18n to strings in the html export ([\#11176](https://github.com/matrix-org/matrix-react-sdk/pull/11176)).
+ * Inhibit url previews on MXIDs containing slashes same as those without ([\#11160](https://github.com/matrix-org/matrix-react-sdk/pull/11160)).
+ * Make event info size consistent with state events ([\#11181](https://github.com/matrix-org/matrix-react-sdk/pull/11181)).
+ * Fix markdown content spacing ([\#11177](https://github.com/matrix-org/matrix-react-sdk/pull/11177)). Fixes #25685.
+ * Fix font-family definition for emojis ([\#11170](https://github.com/matrix-org/matrix-react-sdk/pull/11170)). Fixes #25686.
+ * Fix spurious error sending receipt in thread errors ([\#11157](https://github.com/matrix-org/matrix-react-sdk/pull/11157)).
+ * Consider the empty push rule actions array equiv to deprecated dont_notify ([\#11155](https://github.com/matrix-org/matrix-react-sdk/pull/11155)). Fixes #25674.
+ * Only trap escape key for cancel reply if there is a reply ([\#11140](https://github.com/matrix-org/matrix-react-sdk/pull/11140)). Fixes #25640.
+ * Update linkify to 4.1.1 ([\#11132](https://github.com/matrix-org/matrix-react-sdk/pull/11132)). Fixes #23806.
+
+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)
 =================================================================================================
 

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": {},

debian/conffiles

@@ -0,0 +1 @@
+/usr/share/element-web/config.json

debian/control

@@ -0,0 +1,12 @@
+Package: element-web
+License: Apache-2.0
+Vendor: support@element.io
+Architecture: all
+Maintainer: support@element.io
+Recommends: element-io-archive-keyring
+Section: web
+Priority: optional
+Homepage: https://element.io/
+Version: ${Version}
+Description:
+  A feature-rich client for Matrix.org

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`
 

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.
 

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

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"
     }
 }
 ```

docs/labs.md

@@ -86,11 +86,6 @@ present in the room. The Bridge info tab pulls information from the `m.bridge` s
 bridges are not expected to be compatible, and users should not rely on this
 tab as the single source of truth just yet.
 
-## Presence indicator in room list (`feature_presence_in_room_list`)
-
-This adds a presence indicator in the room list next to DM rooms where the other
-person is online.
-
 ## Custom themes (`feature_custom_themes`)
 
 Custom themes are possible through Element's [theme support](./theming.md), though
@@ -105,40 +100,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.
-
-## Extensible events rendering (`feature_extensible_events`) [In Development]
-
-_Intended for developer use only at the moment._
-
-Extensible Events are a [new event format](https://github.com/matrix-org/matrix-doc/pull/1767) which
-supports graceful fallback in unknown event types. Instead of rendering nothing or a blank space, events
-can define a series of other events which represent the event's information but in different ways. The
-base of these fallbacks being text.
-
-Turning this flag on indicates that, when possible, the extensible events structure should be parsed on
-supported event types. This should lead to zero perceptual change in the timeline except in cases where
-the sender is using unknown/unrecognised event types.
-
-Sending events with extensible events structure is always enabled - this should not affect any downstream
-client.
-
-## Right panel stays open (`feature_right_panel_default_open`)
-
-This is an experimental default open right panel mode as a quick fix for those
-who prefer to have the right panel open consistently across rooms.
-
-If no right panel state is known for the room or it was closed on the last room
-visit, it will default to the room member list. Otherwise, the saved card last
-used in that room is shown.
-
 ## Live location sharing (`feature_location_share_live`) [In Development]
 
 Enables sharing your current location to the timeline, with live updates.
@@ -163,21 +124,16 @@ If you're enabling this at the deployment level, you may also want to reference
 
 Enables rendering of MD / HTML in room topics.
 
-## Exploring public spaces (`feature_exploring_public_spaces`)
-
-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.
-
 ## Use the Rust cryptography implementation (`feature_rust_crypto`) [In Development]
 
 Configures Element to use a new cryptography implementation based on the [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk).
 
 This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implemention will remain in use until users log out.
+
+## New room header & details (`feature_new_room_decoration_ui`) [In Development]
+
+Refactors visually the room header and room sidebar
+
+## Knock rooms (`feature_ask_to_join`) [In Development]
+
+Enables knock feature for rooms. This allows users to ask to join a room.

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",
@@ -12,8 +20,8 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "showLabsSettings": false,
-    "roomDirectory": {
+    "show_labs_settings": false,
+    "room_directory": {
         "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
@@ -31,8 +39,8 @@
         }
     ],
     "posthog": {
-        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.element.io"
+        "project_api_key": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "api_host": "https://posthog.element.io"
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"

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",
@@ -12,8 +20,8 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "showLabsSettings": true,
-    "roomDirectory": {
+    "show_labs_settings": true,
+    "room_directory": {
         "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
@@ -35,16 +43,15 @@
         "environment": "develop"
     },
     "posthog": {
-        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.element.io"
+        "project_api_key": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "api_host": "https://posthog.element.io"
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
     "features": {
-        "feature_spotlight": true,
         "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"
 }

jest.config.ts

@@ -25,7 +25,7 @@ const config: Config = {
     },
     testMatch: ["<rootDir>/test/**/*-test.[tj]s?(x)"],
     setupFiles: ["jest-canvas-mock"],
-    setupFilesAfterEnv: ["<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"],
+    setupFilesAfterEnv: ["<rootDir>/node_modules/matrix-react-sdk/test/setupTests.ts"],
     moduleNameMapper: {
         "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",

module_system/installer.ts

@@ -185,9 +185,20 @@ function getModuleApiVersionFor(moduleName: string): string {
     return findDepVersionInPackageJson(moduleApiDepName, pkgJsonStr);
 }
 
+// A list of Module API versions that are supported in addition to the currently installed one
+// defined in the package.json. This is necessary because semantic versioning is applied to both
+// the Module-side surface of the API and the Client-side surface of the API. So breaking changes
+// in the Client-side surface lead to a major bump even though the Module-side surface stays
+// compatible. We aim to not break the Module-side surface so we maintain a list of compatible
+// older versions.
+const backwardsCompatibleMajorVersions = ["1.0.0"];
+
 function isModuleVersionCompatible(ourApiVersion: string, moduleApiVersion: string): boolean {
     if (!moduleApiVersion) return false;
-    return semver.satisfies(ourApiVersion, moduleApiVersion);
+    return (
+        semver.satisfies(ourApiVersion, moduleApiVersion) ||
+        backwardsCompatibleMajorVersions.some((version) => semver.satisfies(version, moduleApiVersion))
+    );
 }
 
 function writeModulesTs(content: string): void {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.34",
+    "version": "1.11.39",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -36,7 +36,7 @@
         "clean": "rimraf lib webapp",
         "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
         "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
-        "build:jitsi": "node scripts/build-jitsi.js",
+        "build:jitsi": "ts-node scripts/build-jitsi.ts",
         "build:res": "node scripts/copy-res.js",
         "build:genfiles": "yarn build:res && yarn build:jitsi && yarn build:module_system",
         "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
@@ -61,7 +61,7 @@
         "lint:style": "stylelint \"res/css/**/*.pcss\"",
         "test": "jest",
         "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js",
+        "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
         "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp"
     },
     "resolutions": {
@@ -70,16 +70,15 @@
     },
     "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": "^2.0.0",
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "26.1.0",
-        "matrix-react-sdk": "3.74.0",
+        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
-        "sanitize-html": "^2.3.2",
         "ua-parser-js": "^1.0.0"
     },
     "devDependencies": {
@@ -88,6 +87,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",
@@ -109,9 +109,9 @@
         "@types/jsrsasign": "^10.5.4",
         "@types/modernizr": "^3.5.3",
         "@types/node": "^16",
+        "@types/node-fetch": "^2.6.4",
         "@types/react": "17.0.58",
         "@types/react-dom": "17.0.19",
-        "@types/sanitize-html": "^2.3.1",
         "@types/ua-parser-js": "^0.7.36",
         "@typescript-eslint/eslint-plugin": "^5.45.0",
         "@typescript-eslint/parser": "^5.45.0",
@@ -123,15 +123,15 @@
         "cpx": "^1.5.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
-        "eslint": "8.41.0",
+        "eslint": "8.45.0",
         "eslint-config-google": "^0.14.0",
-        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-deprecate": "^0.7.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-matrix-org": "^1.0.0",
         "eslint-plugin-react": "^7.28.0",
         "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^47.0.0",
+        "eslint-plugin-unicorn": "^48.0.0",
         "extract-text-webpack-plugin": "^4.0.0-beta.0",
         "fake-indexeddb": "^4.0.0",
         "fetch-mock-jest": "^1.5.1",
@@ -139,14 +139,14 @@
         "fs-extra": "^11.0.0",
         "html-webpack-plugin": "^4.5.2",
         "jest": "^29.0.0",
-        "jest-canvas-mock": "2.5.1",
+        "jest-canvas-mock": "2.5.2",
         "jest-environment-jsdom": "^29.0.0",
         "jest-mock": "^29.0.0",
         "jest-raw-loader": "^1.0.1",
         "json-loader": "^0.5.7",
         "loader-utils": "^3.0.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^1.4.0",
+        "matrix-web-i18n": "^2.0.0",
         "mini-css-extract-plugin": "^1",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",
@@ -164,19 +164,19 @@
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^5.0.2",
         "prettier": "2.8.8",
+        "proxy-agent": "^6.3.0",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.0",
-        "semver": "^7.3.7",
-        "simple-proxy-agent": "^1.1.0",
+        "semver": "^7.5.2",
         "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",
+        "typescript": "5.1.6",
         "webpack": "^4.46.0",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^3.3.12",

scripts/analyse_unused_exports.ts

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
-"use strict";
 
-const fs = require("fs");
-const { exec } = require("node:child_process");
+import * as fs from "node:fs";
+import { exec } from "node:child_process";
 
 const includeJSSDK = process.argv.includes("--include-js-sdk");
-const ignore = [];
+const ignore: string[] = [];
 
-ignore.push(...Object.values(JSON.parse(fs.readFileSync(`${__dirname}/../components.json`))));
+ignore.push(...Object.values<string>(JSON.parse(fs.readFileSync(`${__dirname}/../components.json`, "utf-8"))));
 ignore.push("/index.ts");
 // We ignore js-sdk by default as it may export for other non element-web projects
 if (!includeJSSDK) ignore.push("matrix-js-sdk");
@@ -31,7 +30,7 @@ exec(command, (error, stdout, stderr) => {
     // won't have an "/" character at the start, so we try to fix that for
     // better UX
     // TODO: This might break on Windows
-    lines = lines.reduce((newLines, line) => {
+    lines = lines.reduce<string[]>((newLines, line) => {
         if (!line.startsWith("/")) newLines.push("/" + line);
         else newLines.push(line);
         return newLines;

scripts/build-jitsi.ts

@@ -3,11 +3,11 @@
 // due to file associations in Windows.
 // Sorry.
 
-const fs = require("fs");
-const path = require("path");
-const { mkdirpSync } = require("mkdirp");
-const fetch = require("node-fetch");
-const ProxyAgent = require("simple-proxy-agent");
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { mkdirpSync } from "mkdirp";
+import fetch from "node-fetch";
+import { ProxyAgent } from "proxy-agent";
 
 console.log("Making webapp directory");
 mkdirpSync("webapp");
@@ -16,15 +16,12 @@ mkdirpSync("webapp");
 console.log("Downloading Jitsi script");
 const fname = path.join("webapp", "jitsi_external_api.min.js");
 
-const options = {};
-if (process.env.HTTPS_PROXY) {
-    options.agent = new ProxyAgent(process.env.HTTPS_PROXY, { tunnel: true });
-}
-
-fetch("https://meet.element.io/libs/external_api.min.js", options)
+fetch("https://meet.element.io/libs/external_api.min.js", {
+    agent: new ProxyAgent(),
+})
     .then((res) => {
         const stream = fs.createWriteStream(fname);
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             res.body.pipe(stream);
             res.body.on("error", (err) => reject(err));
             res.body.on("finish", () => resolve());

scripts/check-i18n.pl

@@ -1 +0,0 @@
-../../matrix-react-sdk/scripts/check-i18n.pl

scripts/copy-res.js

@@ -5,58 +5,56 @@ const loaderUtils = require("loader-utils");
 // copies the resources into the webapp directory.
 //
 
-// Languages are listed manually so we can choose when to include
-// a translation in the app (because having a translation with only
-// 3 strings translated is just frustrating)
-// This could readily be automated, but it's nice to explicitly
-// control when new languages are available.
+// Languages are listed manually, so we can choose when to include a translation in the app
+// (because having a translation with only 3 strings translated is just frustrating)
+// This could readily be automated, but it's nice to explicitly control when new languages are available.
 const INCLUDE_LANGS = [
-    { value: "bg", label: "Български" },
-    { value: "ca", label: "Català" },
-    { value: "cs", label: "čeština" },
-    { value: "da", label: "Dansk" },
-    { value: "de_DE", label: "Deutsch" },
-    { value: "el", label: "Ελληνικά" },
-    { value: "en_EN", label: "English" },
-    { value: "en_US", label: "English (US)" },
-    { value: "eo", label: "Esperanto" },
-    { value: "es", label: "Español" },
-    { value: "et", label: "Eesti" },
-    { value: "eu", label: "Euskara" },
-    { value: "fi", label: "Suomi" },
-    { value: "fr", label: "Français" },
-    { value: "gl", label: "Galego" },
-    { value: "he", label: "עברית" },
-    { value: "hi", label: "हिन्दी" },
-    { value: "hu", label: "Magyar" },
-    { value: "id", label: "Bahasa Indonesia" },
-    { value: "is", label: "íslenska" },
-    { value: "it", label: "Italiano" },
-    { value: "ja", label: "日本語" },
-    { value: "kab", label: "Taqbaylit" },
-    { value: "ko", label: "한국어" },
-    { value: "lo", label: "ລາວ" },
-    { value: "lt", label: "Lietuvių" },
-    { value: "lv", label: "Latviešu" },
-    { value: "nb_NO", label: "Norwegian Bokmål" },
-    { value: "nl", label: "Nederlands" },
-    { value: "nn", label: "Norsk Nynorsk" },
-    { value: "pl", label: "Polski" },
-    { value: "pt", label: "Português" },
-    { value: "pt_BR", label: "Português do Brasil" },
-    { value: "ru", label: "Русский" },
-    { value: "sk", label: "Slovenčina" },
-    { value: "sq", label: "Shqip" },
-    { value: "sr", label: "српски" },
-    { value: "sv", label: "Svenska" },
-    { value: "te", label: "తెలుగు" },
-    { value: "th", label: "ไทย" },
-    { value: "tr", label: "Türkçe" },
-    { value: "uk", label: "українська мова" },
-    { value: "vi", label: "Tiếng Việt" },
-    { value: "vls", label: "West-Vlaams" },
-    { value: "zh_Hans", label: "简体中文" }, // simplified chinese
-    { value: "zh_Hant", label: "繁體中文" }, // traditional chinese
+    "bg",
+    "ca",
+    "cs",
+    "da",
+    "de_DE",
+    "el",
+    "en_EN",
+    "en_US",
+    "eo",
+    "es",
+    "et",
+    "eu",
+    "fi",
+    "fr",
+    "gl",
+    "he",
+    "hi",
+    "hu",
+    "id",
+    "is",
+    "it",
+    "ja",
+    "kab",
+    "ko",
+    "lo",
+    "lt",
+    "lv",
+    "nb_NO",
+    "nl",
+    "nn",
+    "pl",
+    "pt",
+    "pt_BR",
+    "ru",
+    "sk",
+    "sq",
+    "sr",
+    "sv",
+    "te",
+    "th",
+    "tr",
+    "uk",
+    "vi",
+    "vls",
+    "zh_Hans",
+    "zh_Hant",
 ];
 
 // cpx includes globbed parts of the filename in the destination, but excludes
@@ -81,7 +79,6 @@ const parseArgs = require("minimist");
 const Cpx = require("cpx");
 const chokidar = require("chokidar");
 const fs = require("fs");
-const rimraf = require("rimraf");
 
 const argv = parseArgs(process.argv.slice(2), {});
 
@@ -158,7 +155,7 @@ function genLangFile(lang, dest) {
     const reactSdkFile = "node_modules/matrix-react-sdk/src/i18n/strings/" + lang + ".json";
     const riotWebFile = "src/i18n/strings/" + lang + ".json";
 
-    let translations = {};
+    const translations = {};
     [reactSdkFile, riotWebFile].forEach(function (f) {
         if (fs.existsSync(f)) {
             try {
@@ -170,8 +167,6 @@ function genLangFile(lang, dest) {
         }
     });
 
-    translations = weblateToCounterpart(translations);
-
     const json = JSON.stringify(translations, null, 4);
     const jsonBuffer = Buffer.from(json);
     const digest = loaderUtils.getHashDigest(jsonBuffer, null, null, 7);
@@ -188,12 +183,12 @@ function genLangFile(lang, dest) {
 function genLangList(langFileMap) {
     const languages = {};
     INCLUDE_LANGS.forEach(function (lang) {
-        const normalizedLanguage = lang.value.toLowerCase().replace("_", "-");
+        const normalizedLanguage = lang.toLowerCase().replace("_", "-");
         const languageParts = normalizedLanguage.split("-");
         if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
-            languages[languageParts[0]] = { fileName: langFileMap[lang.value], label: lang.label };
+            languages[languageParts[0]] = langFileMap[lang];
         } else {
-            languages[normalizedLanguage] = { fileName: langFileMap[lang.value], label: lang.label };
+            languages[normalizedLanguage] = langFileMap[lang];
         }
     });
     fs.writeFile("webapp/i18n/languages.json", JSON.stringify(languages, null, 4), function (err) {
@@ -207,51 +202,11 @@ function genLangList(langFileMap) {
     }
 }
 
-/**
- * Convert translation key from weblate format
- * (which only supports a single level) to counterpart
- * which requires object values for 'count' translations.
- *
- * eg.
- *     "there are %(count)s badgers|one": "a badger",
- *     "there are %(count)s badgers|other": "%(count)s badgers"
- *   becomes
- *     "there are %(count)s badgers": {
- *         "one": "a badger",
- *         "other": "%(count)s badgers"
- *     }
+/*
+ * watch the input files for a given language,
+ * regenerate the file, adding its content-hashed filename to langFileMap
+ * and regenerating languages.json with the new filename
  */
-function weblateToCounterpart(inTrs) {
-    const outTrs = {};
-
-    for (const key of Object.keys(inTrs)) {
-        const keyParts = key.split("|", 2);
-        if (keyParts.length === 2) {
-            let obj = outTrs[keyParts[0]];
-            if (obj === undefined) {
-                obj = outTrs[keyParts[0]] = {};
-            } else if (typeof obj === "string") {
-                // This is a transitional edge case if a string went from singular to pluralised and both still remain
-                // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
-                obj = outTrs[keyParts[0]] = {
-                    other: inTrs[key],
-                };
-                console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
-            }
-            obj[keyParts[1]] = inTrs[key];
-        } else {
-            outTrs[key] = inTrs[key];
-        }
-    }
-
-    return outTrs;
-}
-
-/**
-watch the input files for a given language,
-regenerate the file, adding its content-hashed filename to langFileMap
-and regenerating languages.json with the new filename
-*/
 function watchLanguage(lang, dest, langFileMap) {
     const reactSdkFile = "node_modules/matrix-react-sdk/src/i18n/strings/" + lang + ".json";
     const riotWebFile = "src/i18n/strings/" + lang + ".json";
@@ -279,8 +234,8 @@ function watchLanguage(lang, dest, langFileMap) {
 // language resources
 const I18N_DEST = "webapp/i18n/";
 const I18N_FILENAME_MAP = INCLUDE_LANGS.reduce((m, l) => {
-    const filename = genLangFile(l.value, I18N_DEST);
-    m[l.value] = filename;
+    const filename = genLangFile(l, I18N_DEST);
+    m[l] = filename;
     return m;
 }, {});
 genLangList(I18N_FILENAME_MAP);

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
 

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"

src/@types/global.d.ts

@@ -32,7 +32,8 @@ type ElectronChannel =
     | "setBadgeCount"
     | "update-downloaded"
     | "userDownloadCompleted"
-    | "userDownloadAction";
+    | "userDownloadAction"
+    | "openDesktopCapturerSourcePicker";
 
 declare global {
     interface Window {
@@ -54,12 +55,6 @@ declare global {
         on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
         send(channel: ElectronChannel, ...args: any[]): void;
     }
-
-    interface Navigator {
-        // PWA badging extensions https://w3c.github.io/badging/
-        setAppBadge?(count: number): Promise<void>;
-        clearAppBadge?(): Promise<void>;
-    }
 }
 
 // add method which is missing from the node typing

src/async-components/structures/CompatibilityView.tsx

@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from "react";
-import { _t } from "matrix-react-sdk/src/languageHandler";
+import React, { ReactNode } from "react";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+
+import { _t } from "../../languageHandler";
+
 // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk
 // PostCSS variables will be accessible.
 import "../../../res/css/structures/ErrorView.pcss";
-import { ReactNode } from "react";
 
 interface IProps {
     onAccept(): void;
@@ -112,15 +113,13 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                             <h2 id="step1_heading">{_t("Your browser can't run %(brand)s", { brand })}</h2>
                             <p>
                                 {_t(
-                                    "%(brand)s uses advanced browser features which aren't " +
-                                        "supported by your current browser.",
+                                    "%(brand)s uses advanced browser features which aren't supported by your current browser.",
                                     { brand },
                                 )}
                             </p>
                             <p>
                                 {_t(
-                                    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, " +
-                                        "or <safariLink>Safari</safariLink> for the best experience.",
+                                    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
                                     {},
                                     {
                                         chromeLink: (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
@@ -131,8 +130,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                             </p>
                             <p>
                                 {_t(
-                                    "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.",
+                                    "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.",
                                 )}
                             </p>
                             <button onClick={onAccept}>{_t("I understand the risks and wish to continue")}</button>

src/async-components/structures/ErrorView.tsx

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from "matrix-react-sdk/src/languageHandler";
+
+import { _t } from "../../languageHandler";
 
 // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk
 // PostCSS variables will be accessible.

src/components/views/auth/VectorAuthFooter.tsx

@@ -17,7 +17,8 @@ limitations under the License.
 
 import React, { ReactElement } from "react";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
-import { _t } from "matrix-react-sdk/src/languageHandler";
+
+import { _t } from "../../../languageHandler";
 
 const VectorAuthFooter = (): ReactElement => {
     const brandingConfig = SdkConfig.getObject("branding");

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 غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.",

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

src/i18n/strings/basefile.json

@@ -1 +1 @@
-{}
+{}

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

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।"
-}
+{}

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.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।"
 }

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.",

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

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",
@@ -28,5 +27,6 @@
     "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(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": "Neplatná konfigurace: default_hs_url nelze použít spolu s default_server_name nebo default_server_config"
 }

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

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

src/i18n/strings/de_DE.json

@@ -6,11 +6,10 @@
     "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",
-    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
+    "Go to your browser to complete Sign In": "Browser öffnen, um die Anmeldung abzuschließen",
     "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.",
     "Unsupported browser": "Nicht unterstützter Browser",
     "Go to element.io": "Gehe zu element.io",
@@ -28,5 +27,6 @@
     "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat & 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"
 }

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": "Άνοιγμα",

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.",

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

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

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

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 & 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"
 }

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

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 نا معتبر است. لطفا مشکل را اصلاح کنید و صفحه را بارگذاری مجدد کنید.",

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

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 & collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée & 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"
 }

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."
 }

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

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

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": "גלה חדרים",

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": "मैं जोखिमों को समझता हूं और जारी रखना चाहता हूं",

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

src/i18n/strings/id.json

@@ -25,8 +25,8 @@
     "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 & collaboration powered by $matrixLogo": "Obrolan & 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"
+    "%(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": "Konfigurasi tidak valid: default_hs_url tidak dapat ditentukan bersama dengan default_server_name atau default_server_config"
 }

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 & 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",

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",
@@ -28,5 +27,6 @@
     "Use %(brand)s on mobile": "Usa %(brand)s su mobile",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s su %(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": "Configurazione non valida: default_hs_url non può essere specificato assieme a default_server_name o default_server_config"
 }

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": "リスクを理解して続行",

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

src/i18n/strings/ka.json

@@ -28,5 +28,5 @@
     "%(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."
+    "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-თან ერთად"
 }

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.",

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": "계정 만들기",
@@ -28,5 +27,6 @@
     "Your Element is misconfigured": "당신의 Element가 잘못 설정되었습니다",
     "Decentralised, encrypted chat & 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_server_name 또는 default_server_config와 함께 default_hs_url을 지정할 수 없습니다."
 }

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.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ."
 }

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ą.",

src/i18n/strings/lv.json

@@ -1,30 +1,32 @@
 {
-    "Dismiss": "Aizvērt",
+    "Dismiss": "Atmest",
     "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 parsē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.",
-    "I understand the risks and wish to continue": "Es apzinos riskus un vēlos turpināt",
+    "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 iespējamās sekas 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": "Lejupielā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",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Nederīga konfigurācija: default_hs_url nevar būt norādīts vienlaicīgi ar default_server_name vai default_server_config"
 }

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": "ഞാൻ അപകടസാധ്യതകൾ മനസിലാക്കുകയും തുടരാൻ ആഗ്രഹിക്കുകയും ചെയ്യുന്നു",

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": "Орхих",

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

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.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।"
 }

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

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

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

src/i18n/strings/pl.json

@@ -8,7 +8,6 @@
     "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.",
@@ -28,5 +27,6 @@
     "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Zdecentralizowany, szyfrowany czat i współpraca oparte na $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "Komputer %(brand)s: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "Komputer %(brand)s: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Nieprawidłowa konfiguracja: nie można określić default_hs_url wraz z default_server_name lub default_server_config"
 }

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,7 +22,7 @@
     "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",

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

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ță.",

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

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.": "වින්‍යාස ගොනුව පූරණය කළ නොහැකිය: පිටුව නැවුම් කරන්න.",

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,16 +16,17 @@
     "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 & 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"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Stolný počítač: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Neplatná konfigurácia: default_hs_url nemôže byť určená spolu s default_server_name alebo default_server_config"
 }

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.",
@@ -22,11 +21,12 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uporablja napredne lastnosti brskalnika, ki jih vaš trenutni brskalnik ne podpira.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Za najboljšo izkušnjo, prosim namestite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ali <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.": "Lahko nadaljujete z uporabo vašega trenutnega brskalnika, vendar lahko to privede do manjkajočih funkcionalnosti ali napačnega izgleda aplikacije.",
-    "I understand the risks and wish to continue": "Razumem riziko in želim vseeno nadaljevati",
+    "I understand the risks and wish to continue": "Razumem tveganje in želim vseeno nadaljevati",
     "Go to element.io": "Pojdi na element.io",
     "Failed to start": "Neuspel zagon",
     "Use %(brand)s on mobile": "Uporabi %(brand)s na mobilni napravi",
     "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliziran, šifriran pogovor in sodelovanje, omogočen z $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Namizni računalnik: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Namizni računalnik: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Nepravilna konfiguracija: če določite default_server_name ali default_server_config default_hs_url ne more biti določen"
 }

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

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.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.",

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

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.",
@@ -28,5 +27,6 @@
     "Use %(brand)s on mobile": "Använd %(brand)s på mobilen",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt & samarbete som drivs av $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s på %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Skrivbord: %(platformName)s"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Skrivbord: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Ogiltig konfiguration: en default_hs_url kan inte anges tillsammans med default_server_name eller default_server_config"
 }

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"
+}

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": "உங்கள் கணக்கை துவங்குங்கள்",

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": "ไปที่เบราว์เซอร์ของคุณเพื่อลงชื่อเข้าใช้ให้เสร็จสมบูรณ์."
 }

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

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 & 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"
 }

src/i18n/strings/vi.json

@@ -5,13 +5,12 @@
     "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.": "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á các phòng",
     "Download Completed": "Tải xuống hoàn tất",
-    "Go to element.io": "Đến element.io",
+    "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.",
@@ -28,5 +27,6 @@
     "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"
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s máy tính: %(platformName)s",
+    "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Cấu hình không hợp lệ: không thể xác định default_hs_url song song với default_server_name hay default_server_config"
 }

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

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": "转到您的浏览器以完成登录",

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 & 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 一起指定"
 }

src/languageHandler.tsx

@@ -0,0 +1,66 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import {
+    IVariables,
+    TranslatedString,
+    TranslationKey as ReactTranslationKey,
+    // eslint-disable-next-line camelcase
+    _t as react_t,
+    // eslint-disable-next-line camelcase
+    _td as react_td,
+    // eslint-disable-next-line camelcase
+    _tDom as react_tDom,
+    Tags,
+    UserFriendlyError as ReactUserFriendlyError,
+    ErrorOptions,
+} from "matrix-react-sdk/src/languageHandler";
+import { Leaves } from "matrix-react-sdk/src/@types/common";
+
+import type ReactEN from "matrix-react-sdk/src/i18n/strings/en_EN.json";
+import type EN from "./i18n/strings/en_EN.json";
+
+/**
+ * This module wraps languageHandler in the matrix-react-sdk and adds type casts to include translations
+ * which we know will be injected by webpack.
+ */
+
+export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }>;
+
+export class UserFriendlyError extends ReactUserFriendlyError {
+    public constructor(message: TranslationKey, substitutionVariablesAndCause?: IVariables & ErrorOptions) {
+        super(message as ReactTranslationKey, substitutionVariablesAndCause);
+    }
+}
+
+export function _td(s: TranslationKey): TranslationKey {
+    return react_td(s as ReactTranslationKey);
+}
+
+// eslint-next-line @typescript-eslint/naming-convention
+export function _t(text: TranslationKey, variables?: IVariables): string;
+export function _t(text: TranslationKey, variables: IVariables | undefined, tags: Tags): React.ReactNode;
+export function _t(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
+    return react_t(text as ReactTranslationKey, variables, tags!);
+}
+
+// eslint-next-line @typescript-eslint/naming-convention
+export function _tDom(text: TranslationKey, variables?: IVariables): TranslatedString;
+export function _tDom(text: TranslationKey, variables: IVariables, tags: Tags): React.ReactNode;
+export function _tDom(text: TranslationKey, variables?: IVariables, tags?: Tags): TranslatedString {
+    return react_tDom(text as ReactTranslationKey, variables!, tags!);
+}

src/vector/app.tsx

@@ -23,7 +23,6 @@ import "matrix-js-sdk/src/browser-index";
 
 import React, { ReactElement } from "react";
 import PlatformPeg from "matrix-react-sdk/src/PlatformPeg";
-import { UserFriendlyError } from "matrix-react-sdk/src/languageHandler";
 import AutoDiscoveryUtils from "matrix-react-sdk/src/utils/AutoDiscoveryUtils";
 import { AutoDiscovery, ClientConfig } from "matrix-js-sdk/src/autodiscovery";
 import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
@@ -34,11 +33,11 @@ import { createClient } from "matrix-js-sdk/src/matrix";
 import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
 import MatrixChat from "matrix-react-sdk/src/components/structures/MatrixChat";
 import { ValidatedServerConfig } from "matrix-react-sdk/src/utils/ValidatedServerConfig";
-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";
+import { UserFriendlyError } from "../languageHandler";
 
 // 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.
@@ -48,40 +47,19 @@ logger.log(`Application is running in ${process.env.NODE_ENV} mode`);
 
 window.matrixLogger = logger;
 
-// We use this to work out what URL the SDK should
-// pass through when registering to allow the user to
-// click back to the client having registered.
-// It's up to us to recognise if we're loaded with
-// this URL and tell MatrixClient to resume registration.
-//
-// If we're in electron, we should never pass through a file:// URL otherwise
-// the identity server will try to 302 the browser to it, which breaks horribly.
-// so in that instance, hardcode to use app.element.io for now instead.
-function makeRegistrationUrl(params: QueryDict): string {
-    let url: string;
-    if (window.location.protocol === "vector:") {
-        url = "https://app.element.io/#/register";
-    } else {
-        url = window.location.protocol + "//" + window.location.host + window.location.pathname + "#/register";
-    }
-
-    const encodedParams = encodeParams(params);
-    if (encodedParams) {
-        url += "?" + encodedParams;
-    }
-
-    return url;
-}
-
 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);
 }
 
@@ -129,16 +107,17 @@ 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}
-            makeRegistrationUrl={makeRegistrationUrl}
             config={config}
             realQueryParams={params}
             startingFragmentQueryParams={fragParams}
             enableGuest={!config.disable_guests}
             onTokenLoginCompleted={onTokenLoginCompleted}
-            initialScreenAfterLogin={getScreenFromLocation(window.location)}
+            initialScreenAfterLogin={initialScreenAfterLogin}
             defaultDeviceDisplayName={defaultDeviceName}
         />
     );
@@ -165,11 +144,10 @@ 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) {
@@ -197,7 +175,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);
         }
@@ -209,6 +187,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);