v1.11.16

Prepare changelog for v1.11.16
Upgrade matrix-react-sdk to 3.62.0
2022-12-06 12:59:53 +00:00 · 2022-12-06 12:59:53 +00:00 · 2022-12-06 12:56:23 +00:00 · 2022-12-06 12:55:51 +00:00 · 2022-12-02 17:00:28 +00:00 · 2022-12-02 17:00:28 +00:00
118 changed files with 1824 additions and 1943 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -14,11 +14,15 @@ module.exports = {
    },
    settings: {
        react: {
-            version: 'detect'
-        }
+            version: 'detect',
+        },
    },
    overrides: [{
-        files: ["src/**/*.{ts,tsx}", "module_system/**/*.{ts,tsx}"],
+        files: [
+            "src/**/*.{ts,tsx}",
+            "test/**/*.{ts,tsx}",
+            "module_system/**/*.{ts,tsx}",
+        ],
        extends: [
            "plugin:matrix-org/typescript",
            "plugin:matrix-org/react",
@@ -68,5 +72,14 @@ module.exports = {
                }],
            }],
        },
+    }, {
+        files: [
+            "test/**/*.{ts,tsx}",
+        ],
+        rules: {
+            // We don't need super strict typing in test utilities
+            "@typescript-eslint/explicit-function-return-type": "off",
+            "@typescript-eslint/explicit-member-accessibility": "off",
+        },
    }],
 };
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -5,7 +5,7 @@ body:
  - type: markdown
    attributes:
      value: |
-        Thank you for taking the time to propose a new feature or make a suggestion.
+        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
  - type: textarea
    id: usecase
    attributes:
--- a/.github/cfp_headers
+++ b/.github/cfp_headers
@@ -0,0 +1,10 @@
+/*
+  X-XSS-Protection: 1; mode=block
+  X-Content-Type-Options: nosniff
+  Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
+
+/version
+  Content-Type: text/plain
+
+/apple-app-site-association
+  Content-Type: application/json
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,6 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      - name: Install Dependencies
        run: "./scripts/layered.sh"
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -1,28 +1,31 @@
 # Separate to the main build workflow for access to develop
 # environment secrets, largely similar to build.yaml.
-name: Build and Package develop
+name: Build and Deploy develop
 on:
  push:
    branches: [ develop ]
  repository_dispatch:
    types: [ element-web-notify ]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
+  group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
  cancel-in-progress: true
 jobs:
  build:
-    name: "Build & Upload source maps to Sentry"
+    name: "Build & Deploy develop.element.io"
    # Only respect triggers from our develop branch, ignore that of forks
    if: github.repository == 'vector-im/element-web'
    runs-on: ubuntu-latest
    environment: develop
+    env:
+      R2_BUCKET: 'element-web-develop'
+      R2_URL: ${{ secrets.CF_R2_S3_API }}
+      R2_PUBLIC_URL: 'https://element-web-develop.element.io'
    steps:
      - uses: actions/checkout@v2

      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      - name: Install Dependencies
        run: "./scripts/layered.sh"
@@ -35,28 +38,78 @@ jobs:
          SENTRY_URL: ${{ secrets.SENTRY_URL }}
          SENTRY_ORG: element
          SENTRY_PROJECT: riot-web
+          # We only deploy the latest bundles to Cloudflare Pages and use _redirects to fallback to R2 for
+          # older ones. This redirect means that 'self' is insufficient in the CSP,
+          # and we have to add the R2 URL.
+          # Once Cloudflare redirects support proxying mode we will be able to ditch this.
+          # See Proxying in support table at https://developers.cloudflare.com/pages/platform/redirects
+          CSP_EXTRA_SOURCE: ${{ env.R2_PUBLIC_URL }}

      - run: mv dist/element-*.tar.gz dist/develop.tar.gz

-      # We keep the latest develop.tar.gz as the artifact uploaded later expires after 24 and requires auth to download
-      # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
-      - name: Deploy develop.tar.gz to Github Pages
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: dist
-          single-commit: true
-
      - uses: actions/upload-artifact@v3
        with:
          name: webapp
          path: dist/develop.tar.gz
          retention-days: 1
+          
+      - name: Extract webapp
+        run: |
+          mkdir _deploy
+          tar xf dist/develop.tar.gz -C _deploy --strip-components=1
+          
+      - name: Copy config
+        run: cp element.io/develop/config.json _deploy/config.json
+
+      - name: Populate 404.html
+        run: echo "404 Not Found" > _deploy/404.html
+
+      - name: Populate _headers
+        run: cp .github/cfp_headers _deploy/_headers
+
+      # Redirect requests for the develop tarball and the historical bundles to R2
+      - name: Populate _redirects
+        run: |
+          {
+            echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
+            for bundle in $(aws s3 ls s3://$R2_BUCKET/bundles/ --endpoint-url $R2_URL --region=auto | awk '{print $2}'); do
+              echo "/bundles/${bundle}* $R2_PUBLIC_URL/bundles/${bundle}:splat 301"
+            done
+          } | tee _deploy/_redirects
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}

      - name: Wait for other steps to succeed
        uses: lewagon/wait-on-check-action@v1.1.2
        with:
          ref: ${{ github.ref }}
-          running-workflow-name: 'Build & Upload source maps to Sentry'
+          running-workflow-name: 'Build & Deploy develop.element.io'
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          wait-interval: 10
-          check-regexp: ^((?!SonarQube|issues|board).)*$
+          check-regexp: ^((?!SonarCloud|SonarQube|issues|board).)*$
+
+      # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
+      # as the expires after 24h and requires auth to download.
+      # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
+      - name: Deploy to R2
+        run: |
+          aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
+          aws s3 cp _deploy/bundles s3://$R2_BUCKET/bundles --recursive --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 }}
+          
+      - name: Deploy to Cloudflare Pages
+        id: cfp
+        uses: cloudflare/pages-action@1
+        with:
+          apiToken: ${{ secrets.CF_PAGES_TOKEN }}
+          accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
+          projectName: element-web-develop
+          directory: _deploy
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          
+      - run: |
+          echo "Deployed to ${{ steps.cfp.outputs.url }}" >> $GITHUB_STEP_SUMMARY
+    
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -19,7 +19,6 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      - name: Install Dependencies
        run: "./scripts/layered.sh"
@@ -27,6 +26,44 @@ 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@v1.0.0
+        with:
+          include: '["\\.tsx?$"]'
+
+      - name: Detecting files changed
+        id: files
+        uses: futuratrepadeira/changed-files@v4.0.0
+        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
@@ -40,7 +77,6 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      # Does not need branch matching as only analyses this layer
      - name: Install Deps
@@ -58,7 +94,6 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
      - name: Install Dependencies
@@ -76,7 +111,6 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      - name: Install Deps
        run: "scripts/layered.sh"
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -21,13 +21,16 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: 'yarn'
-          node-version: 16

      - name: Install Dependencies
        run: "./scripts/layered.sh"

+      - name: Get number of CPU cores
+        id: cpu-cores
+        uses: SimenB/github-actions-cpu-cores@v1
+
      - name: Run tests with coverage
-        run: "yarn coverage --ci"
+        run: "yarn coverage --ci --reporters github-actions --max-workers ${{ steps.cpu-cores.outputs.count }}"

      - name: Upload Artifact
        uses: actions/upload-artifact@v2
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -17,7 +17,9 @@ jobs:
      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
      contains(github.event.issue.labels.*.name, 'A-Tags') ||
      contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Starring')
+      contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
+      contains(github.event.issue.labels.*.name, 'A-Element-Call')
    steps:
      - uses: actions/github-script@v5
        with:
@@ -29,6 +31,23 @@ jobs:
              labels: ['Z-Labs']
            })

+  apply_Help-Wanted_label:
+    name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'good first issue') ||
+      contains(github.event.issue.labels.*.name, 'Hacktoberfest')
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['Help Wanted']
+            })
+
  move_needs_info_issues:
    name: X-Needs-Info issues to Need info column on triage board
    runs-on: ubuntu-latest
@@ -44,7 +63,13 @@ jobs:
    name: P1 X-Needs-Design to Design project board
    runs-on: ubuntu-latest
    if: >
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design')
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y'))
    steps:
      - uses: octokit/graphql-action@v2.x
        id: add_to_project
@@ -52,12 +77,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -76,12 +101,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -104,12 +129,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -127,12 +152,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -150,17 +175,18 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
          PROJECT_ID: "PN_kwDOAM0swc2KCw"
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
  move_message_bubbles_issues:
    name: A-Message-Bubbles to Message bubbles board
    runs-on: ubuntu-latest
@@ -172,12 +198,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -195,12 +221,12 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
@@ -218,14 +244,116 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
+                  }
                }
              }
-            }
          projectid: ${{ env.PROJECT_ID }}
          contentid: ${{ github.event.issue.node_id }}
        env:
          PROJECT_ID: "PN_kwDOAM0swc4AArk0"
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features1:
+    name: Add labelled issues to PS features team 1
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
+        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
+      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
+        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features2:
+    name: Add labelled issues to PS features team 2
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
+      contains(github.event.issue.labels.*.name, 'A-Broadcast')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features3:
+    name: Add labelled issues to PS features team 3
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  voip:
+    name: Add labelled issues to VoIP project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Team: VoIP')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -58,8 +58,8 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
                }
              }
@@ -125,8 +125,8 @@ jobs:
          headers: '{"GraphQL-Features": "projects_next_graphql"}'
          query: |
            mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
                  id
                }
              }
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -48,16 +48,15 @@ jobs:
    if: >
      !(contains(github.event.issue.labels.*.name, 'A-Maths') ||
      contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-      contains(github.event.issue.labels.*.name, 'A-Threads') ||
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
      contains(github.event.issue.labels.*.name, 'Z-IA') ||
      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
      contains(github.event.issue.labels.*.name, 'A-Tags') ||
      contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Starring')) &&
+      contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
+      contains(github.event.issue.labels.*.name, 'A-Element-Call')) &&
      contains(github.event.issue.labels.*.name, 'Z-Labs')
    steps:
      - uses: actions/github-script@v5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,167 @@
+Changes in [1.11.16](https://github.com/vector-im/element-web/releases/tag/v1.11.16) (2022-12-06)
+=================================================================================================
+
+## ✨ Features
+ * Further improve replies ([\#6396](https://github.com/matrix-org/matrix-react-sdk/pull/6396)). Fixes #19074, #18194 #18027 and #19179.
+ * Enable users to join group calls from multiple devices ([\#9625](https://github.com/matrix-org/matrix-react-sdk/pull/9625)).
+ * fix(visual): make cursor a pointer for summaries ([\#9419](https://github.com/matrix-org/matrix-react-sdk/pull/9419)). Contributed by @r00ster91.
+ * Add placeholder for rich text editor ([\#9613](https://github.com/matrix-org/matrix-react-sdk/pull/9613)).
+ * Consolidate public room search experience ([\#9605](https://github.com/matrix-org/matrix-react-sdk/pull/9605)). Fixes #22846.
+ * New password reset flow ([\#9581](https://github.com/matrix-org/matrix-react-sdk/pull/9581)). Fixes #23131.
+ * Device manager - add tooltip to device details toggle ([\#9594](https://github.com/matrix-org/matrix-react-sdk/pull/9594)).
+ * sliding sync: add lazy-loading member support ([\#9530](https://github.com/matrix-org/matrix-react-sdk/pull/9530)).
+ * Limit formatting bar offset to top of composer ([\#9365](https://github.com/matrix-org/matrix-react-sdk/pull/9365)). Fixes #12359. Contributed by @owi92.
+
+## 🐛 Bug Fixes
+ * Fix issues around up arrow event edit shortcut ([\#9645](https://github.com/matrix-org/matrix-react-sdk/pull/9645)). Fixes #18497 and #18964.
+ * Fix search not being cleared when clicking on a result ([\#9635](https://github.com/matrix-org/matrix-react-sdk/pull/9635)). Fixes #23845.
+ * Fix screensharing in 1:1 calls ([\#9612](https://github.com/matrix-org/matrix-react-sdk/pull/9612)). Fixes #23808.
+ * Fix the background color flashing when joining a call ([\#9640](https://github.com/matrix-org/matrix-react-sdk/pull/9640)).
+ * Fix the size of the 'Private space' icon ([\#9638](https://github.com/matrix-org/matrix-react-sdk/pull/9638)).
+ * Fix reply editing in rich text editor (https ([\#9615](https://github.com/matrix-org/matrix-react-sdk/pull/9615)).
+ * Fix thread list jumping back down while scrolling ([\#9606](https://github.com/matrix-org/matrix-react-sdk/pull/9606)). Fixes #23727.
+ * Fix regression with TimelinePanel props updates not taking effect ([\#9608](https://github.com/matrix-org/matrix-react-sdk/pull/9608)). Fixes #23794.
+ * Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes #22861.
+ * Extract Search handling from RoomView into its own Component ([\#9574](https://github.com/matrix-org/matrix-react-sdk/pull/9574)). Fixes #498.
+ * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
+ * [Backport staging] Fix replies to emotes not showing as inline ([\#9708](https://github.com/matrix-org/matrix-react-sdk/pull/9708)).
+
+Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22)
+=================================================================================================
+
+## ✨ Features
+ * Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes #23751.
+ * Change "None" to "Off" in notification options ([\#9539](https://github.com/matrix-org/matrix-react-sdk/pull/9539)). Contributed by @Arnei.
+ * Advanced audio processing settings ([\#8759](https://github.com/matrix-org/matrix-react-sdk/pull/8759)). Fixes #6278. Contributed by @MrAnno.
+ * Add way to create a user notice via config.json ([\#9559](https://github.com/matrix-org/matrix-react-sdk/pull/9559)).
+ * Improve design of the rich text editor ([\#9533](https://github.com/matrix-org/matrix-react-sdk/pull/9533)). Contributed by @florianduros.
+ * Enable user to zoom beyond image size ([\#5949](https://github.com/matrix-org/matrix-react-sdk/pull/5949)). Contributed by @jaiwanth-v.
+ * Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](https://github.com/matrix-org/matrix-react-sdk/pull/9535)). Contributed by @hanadi92.
+
+## 🐛 Bug Fixes
+ * Make build scripts work on NixOS ([\#23740](https://github.com/vector-im/element-web/pull/23740)).
+ * Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](https://github.com/matrix-org/matrix-react-sdk/pull/9520)).
+ * Fix links being mangled by markdown processing ([\#9570](https://github.com/matrix-org/matrix-react-sdk/pull/9570)). Fixes #23743.
+ * Fix: inline links selecting radio button ([\#9543](https://github.com/matrix-org/matrix-react-sdk/pull/9543)). Contributed by @hanadi92.
+ * Fix wrong error message in registration when phone number threepid is in use. ([\#9571](https://github.com/matrix-org/matrix-react-sdk/pull/9571)). Contributed by @bagvand.
+ * Fix missing avatar for show current profiles ([\#9563](https://github.com/matrix-org/matrix-react-sdk/pull/9563)). Fixes #23733.
+ * Fix read receipts trickling down correctly ([\#9567](https://github.com/matrix-org/matrix-react-sdk/pull/9567)). Fixes #23746.
+ * Resilience fix for homeserver without thread notification support ([\#9565](https://github.com/matrix-org/matrix-react-sdk/pull/9565)).
+ * Don't switch to the home page needlessly after leaving a room ([\#9477](https://github.com/matrix-org/matrix-react-sdk/pull/9477)).
+ * Differentiate download and decryption errors when showing images ([\#9562](https://github.com/matrix-org/matrix-react-sdk/pull/9562)). Fixes #3892.
+ * Close context menu when a modal is opened to prevent user getting stuck ([\#9560](https://github.com/matrix-org/matrix-react-sdk/pull/9560)). Fixes #15610 and #10781.
+ * Fix TimelineReset handling when no room associated ([\#9553](https://github.com/matrix-org/matrix-react-sdk/pull/9553)).
+ * Always use current profile on thread events ([\#9524](https://github.com/matrix-org/matrix-react-sdk/pull/9524)). Fixes #23648.
+ * Fix `ThreadView` tests not using thread flag ([\#9547](https://github.com/matrix-org/matrix-react-sdk/pull/9547)). Contributed by @MadLittleMods.
+ * Handle deletion of `m.call` events ([\#9540](https://github.com/matrix-org/matrix-react-sdk/pull/9540)). Fixes #23663.
+ * Fix incorrect notification count after leaving a room with notifications ([\#9518](https://github.com/matrix-org/matrix-react-sdk/pull/9518)). Contributed by @Arnei.
+
+Changes in [1.11.14](https://github.com/vector-im/element-web/releases/tag/v1.11.14) (2022-11-08)
+=================================================================================================
+
+## ✨ Features
+ * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes #21807, #21799, #21911, #22141, #22157, #22641, #22501 #22438 and #21678. Contributed by @justjanne.
+ * Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes #21700.
+ * Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald.
+ * Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros.
+ * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)).
+ * Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald.
+ * Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes #23589.
+ * Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros.
+ * Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald.
+ * Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)).
+ * Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes #21114, #21413, #21416, #21433, #21481, #21798, #21823 #23192 and #21765.
+ * Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns.
+ * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam.
+
+## 🐛 Bug Fixes
+ * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641.
+ * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
+ * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
+ * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes #23646.
+ * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes #23635.
+ * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes #23481.
+ * Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes #23554.
+ * Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes #23584.
+ * Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes #23571.
+ * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
+ * Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes #23511.
+ * Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes #23515.
+ * Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes #23552.
+ * Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes #23147.
+ * Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)).
+ * Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes #22018.
+ * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald.
+ * Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
+
+Changes in [1.11.13](https://github.com/vector-im/element-web/releases/tag/v1.11.13) (2022-11-01)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](https://github.com/matrix-org/matrix-js-sdk/pull/2830)). Contributed by @duxovni.
+ * Catch server versions API call exception when starting the client ([\#2828](https://github.com/matrix-org/matrix-js-sdk/pull/2828)). Fixes vector-im/element-web#23634.
+ * Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](https://github.com/matrix-org/matrix-js-sdk/pull/2822)). Fixes vector-im/element-web#23655.
+
+Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
+
+Changes in [1.11.11](https://github.com/vector-im/element-web/releases/tag/v1.11.11) (2022-10-25)
+=================================================================================================
+
+## ✨ Features
+ * Device manager - tweak string formatting of default device name ([\#23457](https://github.com/vector-im/element-web/pull/23457)).
+ * Add Element Call participant limit ([\#23431](https://github.com/vector-im/element-web/pull/23431)).
+ * Add Element Call `brand` ([\#23443](https://github.com/vector-im/element-web/pull/23443)).
+ * Include a file-safe room name and ISO date in chat exports ([\#9440](https://github.com/matrix-org/matrix-react-sdk/pull/9440)). Fixes #21812 and #19724.
+ * Room call banner ([\#9378](https://github.com/matrix-org/matrix-react-sdk/pull/9378)). Fixes #23453. Contributed by @toger5.
+ * Device manager - spinners while devices are signing out ([\#9433](https://github.com/matrix-org/matrix-react-sdk/pull/9433)). Fixes #15865.
+ * Device manager - silence call ringers when local notifications are silenced ([\#9420](https://github.com/matrix-org/matrix-react-sdk/pull/9420)).
+ * Pass the current language to Element Call ([\#9427](https://github.com/matrix-org/matrix-react-sdk/pull/9427)).
+ * Hide screen-sharing button in Element Call on desktop ([\#9423](https://github.com/matrix-org/matrix-react-sdk/pull/9423)).
+ * Add reply support to WysiwygComposer ([\#9422](https://github.com/matrix-org/matrix-react-sdk/pull/9422)). Contributed by @florianduros.
+ * Disconnect other connected devices (of the same user) when joining an Element call ([\#9379](https://github.com/matrix-org/matrix-react-sdk/pull/9379)).
+ * Device manager - device tile main click target ([\#9409](https://github.com/matrix-org/matrix-react-sdk/pull/9409)).
+ * Add formatting buttons to the rich text editor ([\#9410](https://github.com/matrix-org/matrix-react-sdk/pull/9410)). Contributed by @florianduros.
+ * Device manager - current session context menu ([\#9386](https://github.com/matrix-org/matrix-react-sdk/pull/9386)).
+ * Remove piwik config fallback for privacy policy URL ([\#9390](https://github.com/matrix-org/matrix-react-sdk/pull/9390)).
+ * Add the first step to integrate the matrix wysiwyg composer ([\#9374](https://github.com/matrix-org/matrix-react-sdk/pull/9374)). Contributed by @florianduros.
+ * Device manager - UA parsing tweaks ([\#9382](https://github.com/matrix-org/matrix-react-sdk/pull/9382)).
+ * Device manager - remove client information events when disabling setting ([\#9384](https://github.com/matrix-org/matrix-react-sdk/pull/9384)).
+ * Add Element Call participant limit ([\#9358](https://github.com/matrix-org/matrix-react-sdk/pull/9358)).
+ * Add Element Call room settings ([\#9347](https://github.com/matrix-org/matrix-react-sdk/pull/9347)).
+ * Device manager - render extended device information ([\#9360](https://github.com/matrix-org/matrix-react-sdk/pull/9360)).
+ * New group call experience: Room header and PiP designs ([\#9351](https://github.com/matrix-org/matrix-react-sdk/pull/9351)).
+ * Pass language to Jitsi Widget ([\#9346](https://github.com/matrix-org/matrix-react-sdk/pull/9346)). Contributed by @Fox32.
+ * Add notifications and toasts for Element Call calls ([\#9337](https://github.com/matrix-org/matrix-react-sdk/pull/9337)).
+ * Device manager - device type icon ([\#9355](https://github.com/matrix-org/matrix-react-sdk/pull/9355)).
+ * Delete the remainder of groups ([\#9357](https://github.com/matrix-org/matrix-react-sdk/pull/9357)). Fixes #22770.
+ * Device manager - display client information in device details ([\#9315](https://github.com/matrix-org/matrix-react-sdk/pull/9315)).
+
+## 🐛 Bug Fixes
+ * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
+ * Make ErrorView & CompatibilityView scrollable ([\#23468](https://github.com/vector-im/element-web/pull/23468)). Fixes #23376.
+ * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)).
+ * update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
+ * Don't show call banners in video rooms ([\#9441](https://github.com/matrix-org/matrix-react-sdk/pull/9441)).
+ * Prevent useContextMenu isOpen from being true if the button ref goes away ([\#9418](https://github.com/matrix-org/matrix-react-sdk/pull/9418)). Fixes matrix-org/element-web-rageshakes#15637.
+ * Automatically focus the WYSIWYG composer when you enter a room ([\#9412](https://github.com/matrix-org/matrix-react-sdk/pull/9412)).
+ * Improve the tooltips on the call lobby join button ([\#9428](https://github.com/matrix-org/matrix-react-sdk/pull/9428)).
+ * Pass the homeserver's base URL to Element Call ([\#9429](https://github.com/matrix-org/matrix-react-sdk/pull/9429)). Fixes #23301.
+ * Better accommodate long room names in call toasts ([\#9426](https://github.com/matrix-org/matrix-react-sdk/pull/9426)).
+ * Hide virtual widgets from the room info panel ([\#9424](https://github.com/matrix-org/matrix-react-sdk/pull/9424)). Fixes #23494.
+ * Inhibit clicking on sender avatar in threads list ([\#9417](https://github.com/matrix-org/matrix-react-sdk/pull/9417)). Fixes #23482.
+ * Correct the dir parameter of MSC3715 ([\#9391](https://github.com/matrix-org/matrix-react-sdk/pull/9391)). Contributed by @dhenneke.
+ * Use a more correct subset of users in `/remakeolm` developer command ([\#9402](https://github.com/matrix-org/matrix-react-sdk/pull/9402)).
+ * use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes #23456.
+ * Device manager - eagerly create `m.local_notification_settings` events ([\#9353](https://github.com/matrix-org/matrix-react-sdk/pull/9353)).
+ * Close incoming Element call toast when viewing the call lobby ([\#9375](https://github.com/matrix-org/matrix-react-sdk/pull/9375)).
+ * Always allow enabling sending read receipts ([\#9367](https://github.com/matrix-org/matrix-react-sdk/pull/9367)). Fixes #23433.
+ * Fixes (vector-im/element-web/issues/22609) where the white theme is not applied when `white -> dark -> white` sequence is done. ([\#9320](https://github.com/matrix-org/matrix-react-sdk/pull/9320)). Contributed by @florianduros.
+ * Fix applying programmatically set height for "top" room layout ([\#9339](https://github.com/matrix-org/matrix-react-sdk/pull/9339)). Contributed by @Fox32.
+
 Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
 =================================================================================================

--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # Builder
-FROM node:14-buster as builder
+FROM --platform=$BUILDPLATFORM node:16-buster as builder

 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of element-web develop.
--- a/docs/config.md
+++ b/docs/config.md
@@ -139,6 +139,11 @@ complete re-branding/private labeling, a more personalised experience can be ach
    to hide this dropdown.
 16. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
    users. Set to `true` to disable this functionality.
+17. `user_notice`: Optional notice to show to the user, e.g. for sunsetting a deployment and pushing users to move in their own time.
+    Takes a configuration object as below:
+    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.

 ### `desktop_builds` and `mobile_builds`

@@ -360,8 +365,7 @@ For example:
 ## Integration managers

 Integration managers are embedded applications within Element to help the user configure bots, bridges, and widgets. An integration manager
-is a separate piece of software not typically available with your homeserver. To disable integrations, leave the options defined here out of
-your config.
+is a separate piece of software not typically available with your homeserver. To disable integrations, set the options defined here to `null`.

 1. `integrations_ui_url`: The UI URL for the integration manager.
 2. `integrations_rest_url`: The REST interface URL for the integration manager.
@@ -551,3 +555,4 @@ The following are undocumented or intended for developer use only.
 2. `sync_timeline_limit`
 3. `dangerously_allow_unsafe_and_insecure_passwords`
 4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
+5. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.
--- a/module_system/installer.ts
+++ b/module_system/installer.ts
@@ -123,12 +123,12 @@ function readCurrentPackageDetails(): RawDependencies {
    };
 }

-function writePackageDetails(deps: RawDependencies) {
+function writePackageDetails(deps: RawDependencies): void {
    fs.writeFileSync("./yarn.lock", deps.lockfile, "utf-8");
    fs.writeFileSync("./package.json", deps.packageJson, "utf-8");
 }

-function callYarnAdd(dep: string) {
+function callYarnAdd(dep: string): void {
    // Add the module to the optional dependencies section just in case something
    // goes wrong in restoring the original package details.
    childProcess.execSync(`yarn add -O ${dep}`, {
@@ -186,6 +186,6 @@ function isModuleVersionCompatible(ourApiVersion: string, moduleApiVersion: stri
    return semver.satisfies(ourApiVersion, moduleApiVersion);
 }

-function writeModulesTs(content: string) {
+function writeModulesTs(content: string): void {
    fs.writeFileSync("./src/modules.ts", content, "utf-8");
 }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "element-web",
-  "version": "1.11.10",
+  "version": "1.11.16",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -46,8 +46,8 @@
    "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
    "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint --max-warnings 0 src module_system",
-    "lint:js-fix": "eslint --fix src module_system",
+    "lint:js": "eslint --max-warnings 0 src module_system test",
+    "lint:js-fix": "eslint --fix src module_system test",
    "lint:types": "tsc --noEmit --jsx react && tsc --noEmit --project ./tsconfig.module_system.json",
    "lint:style": "stylelint \"res/css/**/*.pcss\"",
    "test": "jest",
@@ -57,12 +57,11 @@
  "dependencies": {
    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
    "@matrix-org/react-sdk-module-api": "^0.0.3",
-    "browser-request": "^0.3.3",
    "gfm.css": "^1.1.2",
    "jsrsasign": "^10.5.25",
    "katex": "^0.16.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "22.0.0",
+    "matrix-react-sdk": "3.62.0",
    "matrix-widget-api": "^1.1.1",
    "prop-types": "^15.7.2",
    "react": "17.0.2",
@@ -87,12 +86,14 @@
    "@babel/preset-typescript": "^7.12.7",
    "@babel/register": "^7.12.10",
    "@babel/runtime": "^7.12.5",
+    "@casualbot/jest-sonar-reporter": "^2.2.5",
    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
    "@sentry/webpack-plugin": "^1.18.1",
    "@svgr/webpack": "^5.5.0",
    "@testing-library/react": "^12.1.5",
    "@types/flux": "^3.1.9",
    "@types/jest": "^29.0.0",
+    "@types/jsrsasign": "^10.5.4",
    "@types/modernizr": "^3.5.3",
    "@types/node": "^14.18.28",
    "@types/react": "^17.0.49",
@@ -114,9 +115,10 @@
    "eslint-config-google": "^0.14.0",
    "eslint-plugin-deprecate": "^0.7.0",
    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^0.6.1",
+    "eslint-plugin-matrix-org": "^0.8.0",
    "eslint-plugin-react": "^7.28.0",
    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-unicorn": "^44.0.2",
    "extract-text-webpack-plugin": "^4.0.0-beta.0",
    "fake-indexeddb": "^3.1.2",
    "fetch-mock-jest": "^1.5.1",
@@ -128,11 +130,9 @@
    "jest-environment-jsdom": "^29.0.0",
    "jest-mock": "^29.0.0",
    "jest-raw-loader": "^1.0.1",
-    "jest-sonar-reporter": "^2.0.0",
    "json-loader": "^0.5.7",
-    "loader-utils": "^1.4.0",
+    "loader-utils": "^2.0.3",
    "matrix-mock-request": "^2.5.0",
-    "matrix-react-test-utils": "^0.2.3",
    "matrix-web-i18n": "^1.3.0",
    "mini-css-extract-plugin": "^1",
    "minimist": "^1.2.6",
@@ -210,10 +210,11 @@
      "text-summary",
      "lcov"
    ],
-    "testResultsProcessor": "jest-sonar-reporter"
+    "testResultsProcessor": "@casualbot/jest-sonar-reporter"
  },
-  "jestSonar": {
-    "reportPath": "coverage",
-    "sonar56x": true
+  "@casualbot/jest-sonar-reporter": {
+    "outputDirectory": "coverage",
+    "outputName": "jest-sonar-report.xml",
+    "relativePaths": true
  }
 }
--- a/release.sh
+++ b/release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Script to perform a release of element-web.

--- a/res/apple-app-site-association
+++ b/res/apple-app-site-association
@@ -0,0 +1,18 @@
+{
+    "applinks": {
+        "apps": [],
+        "details": [
+            {
+                "appID": "7J4U792NQT.im.vector.app",
+                "paths": [
+                    "*"
+                ]
+            }
+        ]
+    },
+    "webcredentials": {
+        "apps": [
+            "7J4U792NQT.im.vector.app"
+        ]
+    }
+}
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 # Runs package.sh, passing DIST_VERSION determined by git

--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -63,6 +63,7 @@ const INCLUDE_LANGS = [
 // common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
 // "dest/b/...".
 const COPY_LIST = [
+    ["res/apple-app-site-association", "webapp"],
    ["res/manifest.json", "webapp"],
    ["res/sw.js", "webapp"],
    ["res/welcome.html", "webapp"],
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -ex

--- a/scripts/docker-package.sh
+++ b/scripts/docker-package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -ex

--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 # Fetches the js-sdk and matrix-react-sdk dependencies for development
 # or testing purposes
--- a/scripts/get-version-from-git.sh
+++ b/scripts/get-version-from-git.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 # Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
 # these dependencies are git checkouts.
--- a/scripts/layered.sh
+++ b/scripts/layered.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -ex

--- a/scripts/make-icons.sh
+++ b/scripts/make-icons.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Converts an svg logo into the various image resources required by
 # the various platforms deployments.
--- a/scripts/normalize-version.sh
+++ b/scripts/normalize-version.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -e

--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -e

--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -1,295 +0,0 @@
-#!/usr/bin/env python
-#
-# auto-deploy script for https://develop.element.io
-#
-# Listens for buildkite webhook pokes (https://buildkite.com/docs/apis/webhooks)
-# When it gets one, downloads the artifact from buildkite
-# and deploys it as the new version.
-#
-# Requires the following python packages:
-#
-#   - requests
-#   - flask
-#
-from __future__ import print_function
-import requests, argparse, os, errno
-import time
-import traceback
-import glob
-import re
-import shutil
-import threading
-from Queue import Queue
-
-from flask import Flask, jsonify, request, abort
-
-from deploy import Deployer, DeployException
-
-app = Flask(__name__)
-
-deployer = None
-arg_extract_path = None
-arg_webhook_token = None
-arg_api_token = None
-
-workQueue = Queue()
-
-
-def req_headers():
-    return {
-        "Authorization": "Bearer %s" % (arg_api_token,),
-    }
-
-# Buildkite considers a poke to have failed if it has to wait more than 10s for
-# data (any data, not just the initial response) and it normally takes longer than
-# that to download an artifact from buildkite. Apparently there is no way in flask
-# to finish the response and then keep doing stuff, so instead this has to involve
-# threading. Sigh.
-def worker_thread():
-    while True:
-        toDeploy = workQueue.get()
-        deploy_buildkite_artifact(*toDeploy)
-
-@app.route("/", methods=["POST"])
-def on_receive_buildkite_poke():
-    got_webhook_token = request.headers.get('X-Buildkite-Token')
-    if got_webhook_token != arg_webbook_token:
-        print("Denying request with incorrect webhook token: %s" % (got_webhook_token,))
-        abort(400, "Incorrect webhook token")
-        return
-
-    required_api_prefix = None
-    if arg_buildkite_org is not None:
-        required_api_prefix = 'https://api.buildkite.com/v2/organizations/%s' % (arg_buildkite_org,)
-
-    incoming_json = request.get_json()
-    if not incoming_json:
-        abort(400, "No JSON provided!")
-        return
-    print("Incoming JSON: %s" % (incoming_json,))
-
-    event = incoming_json.get("event")
-    if event is None:
-        abort(400, "No 'event' specified")
-        return
-
-    if event == 'ping':
-        print("Got ping request - responding")
-        return jsonify({'response': 'pong!'})
-
-    if event != 'build.finished':
-        print("Rejecting '%s' event")
-        abort(400, "Unrecognised event")
-        return
-
-    build_obj = incoming_json.get("build")
-    if build_obj is None:
-        abort(400, "No 'build' object")
-        return
-
-    build_url = build_obj.get('url')
-    if build_url is None:
-        abort(400, "build has no url")
-        return
-
-    if required_api_prefix is not None and not build_url.startswith(required_api_prefix):
-        print("Denying poke for build url with incorrect prefix: %s" % (build_url,))
-        abort(400, "Invalid build url")
-        return
-
-    build_num = build_obj.get('number')
-    if build_num is None:
-        abort(400, "build has no number")
-        return
-
-    pipeline_obj = incoming_json.get("pipeline")
-    if pipeline_obj is None:
-        abort(400, "No 'pipeline' object")
-        return
-
-    pipeline_name = pipeline_obj.get('name')
-    if pipeline_name is None:
-        abort(400, "pipeline has no name")
-        return
-
-    artifacts_url = build_url + "/artifacts"
-    artifacts_resp = requests.get(artifacts_url, headers=req_headers())
-    artifacts_resp.raise_for_status()
-    artifacts_array = artifacts_resp.json()
-
-    artifact_to_deploy = None
-    for artifact in artifacts_array:
-        if re.match(r"dist/.*.tar.gz", artifact['path']):
-            artifact_to_deploy = artifact
-    if artifact_to_deploy is None:
-        print("No suitable artifacts found")
-        return jsonify({})
-
-    # double paranoia check: make sure the artifact is on the right org too
-    if required_api_prefix is not None and not artifact_to_deploy['url'].startswith(required_api_prefix):
-        print("Denying poke for build url with incorrect prefix: %s" % (artifact_to_deploy['url'],))
-        abort(400, "Refusing to deploy artifact from URL %s", artifact_to_deploy['url'])
-        return
-
-    # there's no point building up a queue of things to deploy, so if there are any pending jobs,
-    # remove them
-    while not workQueue.empty():
-        try:
-            workQueue.get(False)
-        except:
-            pass
-    workQueue.put([artifact_to_deploy, pipeline_name, build_num])
-
-    return jsonify({})
-
-def deploy_buildkite_artifact(artifact, pipeline_name, build_num):
-    artifact_response = requests.get(artifact['url'], headers=req_headers())
-    artifact_response.raise_for_status()
-    artifact_obj = artifact_response.json()
-
-    # we extract into a directory based on the build number. This avoids the
-    # problem of multiple builds building the same git version and thus having
-    # the same tarball name. That would lead to two potential problems:
-    #   (a) sometimes jenkins serves corrupted artifacts; we would replace
-    #       a good deploy with a bad one
-    #   (b) we'll be overwriting the live deployment, which means people might
-    #       see half-written files.
-    build_dir = os.path.join(arg_extract_path, "%s-#%s" % (pipeline_name, build_num))
-    try:
-        extracted_dir = deploy_tarball(artifact_obj, build_dir)
-    except DeployException as e:
-        traceback.print_exc()
-        abort(400, e.message)
-
-
-def deploy_tarball(artifact, build_dir):
-    """Download a tarball from jenkins and unpack it
-
-    Returns:
-        (str) the path to the unpacked deployment
-    """
-    if os.path.exists(build_dir):
-        raise DeployException(
-            "Not deploying. We have previously deployed this build."
-        )
-    os.mkdir(build_dir)
-
-    print("Fetching artifact %s -> %s..." % (artifact['download_url'], artifact['filename']))
-
-    # Download the tarball here as buildkite needs auth to do this
-    # we don't pgp-sign buildkite artifacts, relying on HTTPS and buildkite
-    # not being evil. If that's not good enough for you, don't use develop.element.io.
-    resp = requests.get(artifact['download_url'], stream=True, headers=req_headers())
-    resp.raise_for_status()
-    with open(artifact['filename'], 'wb') as ofp:
-        shutil.copyfileobj(resp.raw, ofp)
-    print("...download complete. Deploying...")
-
-    # we rely on the fact that flask only serves one request at a time to
-    # ensure that we do not overwrite a tarball from a concurrent request.
-
-    return deployer.deploy(artifact['filename'], build_dir)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser("Runs a Vector redeployment server.")
-    parser.add_argument(
-        "-p", "--port", dest="port", default=4000, type=int, help=(
-            "The port to listen on for requests from Jenkins."
-        )
-    )
-    parser.add_argument(
-        "-e", "--extract", dest="extract", default="./extracted", help=(
-            "The location to extract .tar.gz files to."
-        )
-    )
-    parser.add_argument(
-        "-b", "--bundles-dir", dest="bundles_dir", help=(
-            "A directory to move the contents of the 'bundles' directory to. A \
-            symlink to the bundles directory will also be written inside the \
-            extracted tarball. Example: './bundles'."
-        )
-    )
-    parser.add_argument(
-        "-c", "--clean", dest="clean", action="store_true", default=False, help=(
-            "Remove .tar.gz files after they have been downloaded and extracted."
-        )
-    )
-    parser.add_argument(
-        "-s", "--symlink", dest="symlink", default="./latest", help=(
-            "Write a symlink to this location pointing to the extracted tarball. \
-            New builds will keep overwriting this symlink. The symlink will point \
-            to the /vector directory INSIDE the tarball."
-        )
-    )
-
-    # --include ../../config.json ./localhost.json homepages/*
-    parser.add_argument(
-        "--include", nargs='*', default='./config*.json', help=(
-            "Symlink these files into the root of the deployed tarball. \
-             Useful for config files and home pages. Supports glob syntax. \
-             (Default: '%(default)s')"
-        )
-    )
-    parser.add_argument(
-        "--test", dest="tarball_uri", help=(
-            "Don't start an HTTP listener. Instead download a build from Jenkins \
-            immediately."
-        ),
-    )
-
-    parser.add_argument(
-        "--webhook-token", dest="webhook_token", help=(
-            "Only accept pokes with this buildkite token."
-        ), required=True,
-    )
-
-    parser.add_argument(
-        "--api-token", dest="api_token", help=(
-            "API access token for buildkite. Require read_artifacts scope."
-        ), required=True,
-    )
-
-    # We require a matching webhook token, but because we take everything else
-    # about what to deploy from the poke body, we can be a little more paranoid
-    # and only accept builds / artifacts from a specific buildkite org
-    parser.add_argument(
-        "--org", dest="buildkite_org", help=(
-            "Lock down to this buildkite org"
-        )
-    )
-
-    args = parser.parse_args()
-    arg_extract_path = args.extract
-    arg_webbook_token = args.webhook_token
-    arg_api_token = args.api_token
-    arg_buildkite_org = args.buildkite_org
-
-    if not os.path.isdir(arg_extract_path):
-        os.mkdir(arg_extract_path)
-
-    deployer = Deployer()
-    deployer.bundles_path = args.bundles_dir
-    deployer.should_clean = args.clean
-    deployer.symlink_latest = args.symlink
-
-    for include in args.include:
-        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
-
-    if args.tarball_uri is not None:
-        build_dir = os.path.join(arg_extract_path, "test-%i" % (time.time()))
-        deploy_tarball(args.tarball_uri, build_dir)
-    else:
-        print(
-            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Include files: %s" %
-            (args.port,
-             arg_extract_path,
-             " (clean after)" if deployer.should_clean else "",
-             args.symlink,
-             deployer.symlink_paths,
-            )
-        )
-        fred = threading.Thread(target=worker_thread)
-        fred.daemon = True
-        fred.start()
-        app.run(port=args.port, debug=False)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -11,4 +11,4 @@ sonar.exclusions=__mocks__,docs,element.io,nginx
 sonar.typescript.tsconfigPath=./tsconfig.json
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.coverage.exclusions=test/**/*,res/**/*
-sonar.testExecutionReportPaths=coverage/test-report.xml
+sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React from 'react';
+import React, { ReactElement } from 'react';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 import { _t } from 'matrix-react-sdk/src/languageHandler';

-const VectorAuthFooter = () => {
+const VectorAuthFooter = (): ReactElement => {
    const brandingConfig = SdkConfig.getObject("branding");
    const links = brandingConfig?.get("auth_footer_links") ?? [
        { "text": "Blog", "url": "https://element.io/blog" },
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,7 +19,7 @@ import * as React from 'react';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';

 export default class VectorAuthHeaderLogo extends React.PureComponent {
-    public render() {
+    public render(): React.ReactElement {
        const brandingConfig = SdkConfig.getObject("branding");
        const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";

--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -23,7 +23,7 @@ export default class VectorAuthPage extends React.PureComponent {
    private static welcomeBackgroundUrl;

    // cache the url as a static to prevent it changing without refreshing
-    private static getWelcomeBackgroundUrl() {
+    private static getWelcomeBackgroundUrl(): string {
        if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;

        const brandingConfig = SdkConfig.getObject("branding");
@@ -42,7 +42,7 @@ export default class VectorAuthPage extends React.PureComponent {
        return VectorAuthPage.welcomeBackgroundUrl;
    }

-    public render() {
+    public render(): React.ReactElement {
        const pageStyle = {
            background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
        };
--- a/src/favicon.ts
+++ b/src/favicon.ts
@@ -56,7 +56,7 @@ export default class Favicon {
    // callback to run once isReady is asserted, allows for a badge to be queued for when it can be shown
    private readyCb?: () => void;

-    constructor(params: Partial<IParams> = {}) {
+    public constructor(params: Partial<IParams> = {}) {
        this.params = { ...defaults, ...params };

        this.icons = Favicon.getIcons();
@@ -68,7 +68,7 @@ export default class Favicon {
        const lastIcon = this.icons[this.icons.length - 1];
        if (lastIcon.hasAttribute("href")) {
            this.baseImage.setAttribute("crossOrigin", "anonymous");
-            this.baseImage.onload = () => {
+            this.baseImage.onload = (): void => {
                // get height and width of the favicon
                this.canvas.height = (this.baseImage.height > 0) ? this.baseImage.height : 32;
                this.canvas.width = (this.baseImage.width > 0) ? this.baseImage.width : 32;
@@ -217,7 +217,7 @@ export default class Favicon {

    public badge(content: number | string, opts?: Partial<IParams>): void {
        if (!this.isReady) {
-            this.readyCb = () => {
+            this.readyCb = (): void => {
                this.badge(content, opts);
            };
            return;
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -15,9 +15,7 @@
    "Unexpected error preparing the app. See console for details.": "حدث عُطل غير متوقع أثناء تجهيز التطبيق. طالِع المِعراض للتفاصيل.",
    "Download Completed": "اكتمل التنزيل",
    "Open": "افتح",
-    "%(brand)s Desktop (%(platformName)s)": "‏‏%(brand)s لسطح المكتب (%(platformName)s)",
    "Go to your browser to complete Sign In": "افتح المتصفح لإكمال الولوج",
-    "%(appName)s (%(browserName)s, %(osName)s)": "‏‏%(appName)s (‏‏%(browserName)s، ‏‏%(osName)s)",
    "Unsupported browser": "متصفح غير مدعوم",
    "Your browser can't run %(brand)s": "لا يمكن لمتصفحك تشغيل %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "يستعمل %(brand)s ميزات متقدمة في المتصفحات لا يدعمها متصفحك الحالي.",
@@ -28,6 +26,5 @@
    "Failed to start": "فشل البدء",
    "Powered by Matrix": "تدعمه «ماترِكس»",
    "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول",
-    "Switch to space by number": "التبديل إلى المساحة بالرقم",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "محادثة لامركزية، مشفرة &amp; تعمل بواسطة $matrixLogo"
 }
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -10,7 +10,6 @@
    "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s",
    "Dismiss": "Nəzərə almayın",
    "Welcome to Element": "Element-ə xoş gəlmişsiniz",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[matrix] tərəfindən təchiz edilmiş mərkəziləşdirilməmiş, şifrələnmiş çat və əməkdaşlıq platforması",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo tərəfindən dəstəklənən mərkəzləşdirilməmiş ,şifrələnmiş söhbət &amp; əməkdaşlıq",
    "Failed to start": "Başlatmaq alınmadı",
    "Go to element.io": "element.io saytına keçin",
@@ -22,9 +21,7 @@
    "Unsupported browser": "Dəstəklənməyən brauzer",
    "Use %(brand)s on mobile": "Mobil telefonda %(brand)s istifadə edin",
    "Powered by Matrix": "Gücünü Matrix'dən alır",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Go to your browser to complete Sign In": "Girişi tamamlamaq üçün brauzerinizə keçin",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
    "Open": "Aç",
    "Download Completed": "Yükləmə Tamamlandı",
    "Unable to load config file: please refresh the page to try again.": "Konfiqurasiya faylını yükləmək mümkün deyil: yenidən cəhd etmək üçün səhifəni yeniləyin.",
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "Невалиден JSON",
    "Go to your browser to complete Sign In": "Отидете в браузъра за да завършите влизането",
    "Unable to load config file: please refresh the page to try again.": "Неуспешно зареждане на конфигурационния файл: презаредете страницата за да опитате пак.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Неподдържан браузър",
    "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.": "Може да продължите да използвате сегашния си браузър, но някои или всички функции може да се окажат неработещи, или пък външния вид на приложението да изглежда неправилен.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.",
    "Powered by Matrix": "Базирано на Matrix",
    "Use %(brand)s on mobile": "Използвайте %(brand)s на мобилен телефон",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s под %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@@ -10,10 +10,8 @@
    "Download Completed": "Preuzimanje završeno",
    "Open": "Otvori",
    "Dismiss": "Odbaci",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Radna povrsina (%(platformName)s)",
    "Go to your browser to complete Sign In": "Idite na svoj pretraživač da biste dovršili prijavu",
    "Unknown device": "Nepoznat uređaj",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Pokretano uz Matrix",
    "Unsupported browser": "Nepodržani pretraživač",
    "Your browser can't run %(brand)s": "Vaš pretraživač ne može pokretati %(brand)s",
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -16,8 +16,6 @@
    "Unexpected error preparing the app. See console for details.": "Error inesperat durant la preparació de l'aplicació. Consulta la consola pels a més detalls.",
    "Download Completed": "Baixada completada",
    "Open": "Obre",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s d'escriptori (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Amb tecnologia de Matrix",
    "Unsupported browser": "Navegador no compatible",
    "Your browser can't run %(brand)s": "El teu navegador no pot executar %(brand)s",
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -16,7 +16,6 @@
    "Unable to load config file: please refresh the page to try again.": "Nepodařilo se načíst konfigurační soubor: abyste to zkusili znovu, načtěte prosím znovu stránku.",
    "Download Completed": "Stahování dokončeno",
    "Open": "Otevřít",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nepodporovaný prohlížeč",
    "Your browser can't run %(brand)s": "Váš prohlížeč nedokáže spustit %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s využívá pokročilých funkcí prohlížeče, které ten váš nepodporuje.",
@@ -26,7 +25,8 @@
    "Go to element.io": "Přejít na element.io",
    "Failed to start": "Nepovedlo se nastartovat",
    "Powered by Matrix": "Běží na Matrixu",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
    "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo"
+    "Decentralised, encrypted chat &amp; 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"
 }
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -1,6 +1,5 @@
 {
    "Dismiss": "Afvis",
-    "powered by Matrix": "Drevet af Matrix",
    "Unknown device": "Ukendt enhed",
    "Welcome to Element": "Velkommen til Element",
    "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s",
@@ -19,14 +18,15 @@
    "Open": "Åbn",
    "Download Completed": "Hentning færdig",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.",
-    "Your Element is misconfigured": "Din Element er konfigureret forkert",
+    "Your Element is misconfigured": "Dit Element er konfigureret forkert",
    "Your browser can't run %(brand)s": "Din browser kan ikke køre %(brand)s",
    "Powered by Matrix": "Drevet af Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Failed to start": "Opstart mislykkedes",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop %(platformName)s",
    "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.": "Du kan fortsætte med at bruge din nuværende browser, men du kan opleve at visse eller alle funktioner ikke vil fungere korrekt.",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Venligst installer <chromeLink>Chrome</chromeLink>,<firefoxLink>Firefox</firefoxLink> eller <safariLink>Safari</safariLink> for den bedste oplevelse.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruger avanceret browser funktioner som ikke er understøttet af din nuværende browser.",
-    "Use %(brand)s on mobile": "Brug %(brand)s på mobil"
+    "Use %(brand)s on mobile": "Brug %(brand)s på mobil",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliseret, krypteret chat &amp; samarbejde drevet af $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s på %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -15,8 +15,6 @@
    "Unsupported browser": "Nicht unterstützter Browser",
    "Go to element.io": "Gehe zu element.io",
    "Failed to start": "Start fehlgeschlagen",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
    "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.": "Du kannst deinen aktuellen Browser weiterhin verwenden. Es ist aber möglich, dass nicht alles richtig funktioniert oder das Aussehen der App inkorrekt ist.",
    "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
@@ -28,5 +26,7 @@
    "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
    "Powered by Matrix": "Betrieben mit Matrix",
    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s auf %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -25,9 +25,6 @@
    "I understand the risks and wish to continue": "Κατανοώ τους κινδύνους και επιθυμώ να συνεχίσω",
    "Go to element.io": "Πήγαινε στο element.io",
    "Failed to start": "Αποτυχία έναρξης",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Use %(brand)s on mobile": "Χρήση %(brand)s σε κινητό",
-    "Switch to space by number": "Εναλλαγή σε space με αριθμό",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το $matrixLogo"
 }
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -19,9 +19,7 @@
    "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
    "Unsupported browser": "Unsupported browser",
    "Powered by Matrix": "Powered by Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Go to your browser to complete Sign In": "Go to your browser to complete Sign In",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Open": "Open",
    "Download Completed": "Download Completed",
    "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "Nevalida JSON",
    "Go to your browser to complete Sign In": "Iru al via retumilo por finpretigi la ensaluton",
    "Unable to load config file: please refresh the page to try again.": "Ne povas enlegi agordan dosieron: bonvolu reprovi per aktualigo de la paĝo.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s labortabla (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nesubtenata retumilo",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali retumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
    "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.": "Vi povas daŭre uzi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkciu, kaj la aspekto de la aplikaĵo eble ne estu ĝusta.",
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "JSON inválido",
    "Go to your browser to complete Sign In": "Abre tu navegador web para completar el registro",
    "Unable to load config file: please refresh the page to try again.": "No se ha podido cargar el archivo de configuración. Recarga la página para intentarlo otra vez.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s de escritorio (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navegador no compatible",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
    "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.": "Puedes seguir utilizando tu navegador actual, pero puede que algunas funcionalidades no estén disponibles o que algunas partes de la aplicación se muestren de forma incorrecta.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
    "Powered by Matrix": "Funciona con Matrix",
    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s en %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s de escritorio: %(platformName)s"
 }
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -12,8 +12,6 @@
    "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element",
    "Sign In": "Logi sisse",
    "Create Account": "Loo konto",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Sellele brauserile puudub tugi",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
    "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.": "Sa võid jätkata praeguse brauseri kasutamist, kuid mõned või kõik funktsionaalsused ei pruugi toimida ning rakenduse välimus võib vigane olla.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
    "Powered by Matrix": "Põhineb Matrix'il",
    "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "JSON baliogabea",
    "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko",
    "Unable to load config file: please refresh the page to try again.": "Ezin izan da konfigurazio fitxategia kargatu: Saiatu orria birkargatzen.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Onartu gabeko nabigatzailea",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalatu <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, edo <safariLink>Safari</safariLink> esperientzia hobe baterako.",
    "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.": "Zure oraingo nabigatzailea erabiltzen jarraitu dezakezu, baina ezaugarri batzuk agian ez dute funtzionatuko eta itxura desegokia izan daiteke.",
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -16,8 +16,6 @@
    "Unexpected error preparing the app. See console for details.": "خطای غیر منتظره در آماده سازی برنامه. کنسول را برای جزئیات مشاهده کنید.",
    "Download Completed": "بارگیری کامل شد",
    "Open": "باز",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s میزکار %(platformName)s",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "مرورگر پش‬تبانی نمی شود",
    "Your browser can't run %(brand)s": "مرورگر شما نمی تواند %(brand)s را اجرا کند",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s از ویژگی های پیشرفته مرورگر استفاده می کند که در مرورگر فعلی شما پشتیبانی نمی شوند.",
@@ -28,5 +26,7 @@
    "Failed to start": "خطا در شروع",
    "Powered by Matrix": "راه اندازی شده با استفاده از ماتریکس",
    "Use %(brand)s on mobile": "از %(brand)s گوشی استفاده کنید",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "همکاری چت غیرمتمرکز و رمزگذاری شده &amp; توسعه یافته با استفاده از $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "همکاری چت غیرمتمرکز و رمزگذاری شده &amp; توسعه یافته با استفاده از $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s: روی %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s دسکتاپ: %(platformName)s"
 }
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -11,9 +11,7 @@
    "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s",
    "Invalid JSON": "Virheellinen JSON",
    "Unable to load config file: please refresh the page to try again.": "Asetustiedostoa ei voi ladata. Yritä uudelleen lataamalla sivu uudelleen.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)sin työpöytäversio (%(platformName)s)",
    "Go to your browser to complete Sign In": "Tee kirjautuminen loppuun selaimessasi",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Selainta ei tueta",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
    "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.": "Voit käyttää edelleen nykyistä selaintasi, mutta jotkut tai kaikki ominaisuudet eivät ehkä toimi ja sovelluksen ulkoasu voi olla virheellinen.",
@@ -27,5 +25,8 @@
    "Powered by Matrix": "Moottorina Matrix",
    "Your browser can't run %(brand)s": "%(brand)s ei toimi selaimessasi",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue.",
-    "Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti"
+    "Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajautettu, salattu keskustelu &amp; yhteistyö, taustavoimana $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s käyttöjärjestelmällä %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)sin työpöytäversio: %(platformName)s"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -12,14 +12,12 @@
    "Invalid JSON": "JSON non valide",
    "Go to your browser to complete Sign In": "Utilisez votre navigateur pour terminer la connexion",
    "Unable to load config file: please refresh the page to try again.": "Impossible de charger le fichier de configuration : rechargez la page pour réessayer.",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navigateur non pris en charge",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Veuillez installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ou <safariLink>Safari</safariLink> pour une expérience optimale.",
    "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.": "Vous pouvez continuer à utiliser votre navigateur actuel, mais vous risquez de trouver que certaines fonctionnalités et/ou l’apparence de l’application sont incorrectes.",
    "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
    "Go to element.io": "Aller vers element.io",
    "Failed to start": "Échec au démarrage",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pour bureau (%(platformName)s)",
    "Download Completed": "Téléchargement terminé",
    "Open": "Ouvrir",
    "Your Element is misconfigured": "Votre Element est mal configuré",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne prend pas en charge.",
    "Powered by Matrix": "Propulsé par Matrix",
    "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s : %(browserName)s pour %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s"
 }
--- a/src/i18n/strings/fy.json
+++ b/src/i18n/strings/fy.json
@@ -5,12 +5,10 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Graach <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of<safariLink>Safari</safariLink> ynstallearje foar de beste ûnderfining.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browserfunksjes dy’t net stipe wurde troch de browser dy’t jo no brûke.",
    "Powered by Matrix": "Mooglik makke troch Matrix",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Unexpected error preparing the app. See console for details.": "Unferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn de console foar details.",
    "The message from the parser is: %(message)s": "It berjocht fan de ferwurker is: %(message)s",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element-konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha, kin dizze side ferfarske wurde.",
    "Use %(brand)s on mobile": "Brûk %(brand)s op mobyl",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen te foltôgjen",
    "Download Completed": "Download foltôge",
    "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasjebestân net lade: ferfarskje de side en probearje it nochris.",
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -15,8 +15,6 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Suiteáil <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> chun an taithí is fearr a fháil.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "Úsáideann %(brand)s gnéithe ardforbartha nach bhfuil ar fáil faoi do bhrabhsálaí reatha.",
    "Unsupported browser": "Brabhsálaí gan tacaíocht",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s deisce (%(platformName)s)",
    "Unexpected error preparing the app. See console for details.": "Earráid nuair an feidhmchlár a hullmhú. Feic sa consól le haghaidh eolas.",
    "Unable to load config file: please refresh the page to try again.": "Ní féidir an comhad cumraíochta a lódáil. Athnuaigh an leathanach chun déanamh iarracht arís le do thoil.",
    "Download Completed": "Íoslódáil críochnaithe",
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -11,9 +11,7 @@
    "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.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navegador non soportado",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
    "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.": "Podes continuar co teu navegador, pero algunhas características poderían non funcionar e o aspecto da aplicación podería non ser o correcto.",
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -24,11 +24,7 @@
    "Your browser can't run %(brand)s": "הדפדפן שלך לא יכול להריץ %(brand)s",
    "Unsupported browser": "דפדפן לא נתמך",
    "Powered by Matrix": "מופעל על ידי מטריקס",
-    "%(appName)s (%(browserName)s, %(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",
-    "Missing indexeddb worker script!": "סקריפט indexeddb worker חסר!",
-    "Switch to space by number": "עבור 'למרחב' על פי המספר שלו",
    "Use %(brand)s on mobile": "השתמש ב-%(brand)s במכשיר הנייד",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "צ'אט מבוזר ומוצפן &amp; מופעל בשיתוף פעולה ע\"י $matrixLogo"
 }
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -5,8 +5,6 @@
    "Sign In": "साइन करना",
    "Create Account": "खाता बनाएं",
    "Explore rooms": "रूम का अन्वेषण करें",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)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 में से कोई एक निर्दिष्ट कर सकता है।",
    "Failed to start": "प्रारंभ करने में विफल",
    "Go to element.io": "element.io पर जाएं",
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "Érvénytelen JSON",
    "Go to your browser to complete Sign In": "A böngészőben fejezze be a bejelentkezést",
    "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítse az oldalt és próbálja meg újra.",
-    "%(brand)s Desktop (%(platformName)s)": "Asztali %(brand)s (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nem támogatott böngésző",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</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.": "Folytathatja a jelenlegi böngészőjével, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "A(z) %(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.",
    "Powered by Matrix": "A gépházban: Matrix",
    "Use %(brand)s on mobile": "Mobilon használja ezt: %(brand)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Elosztott, titkosított csevegés és együttműködés ezzel: $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Elosztott, titkosított csevegés és együttműködés ezzel: $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: (%(browserName)s itt: %(osName)s)",
+    "%(brand)s Desktop: %(platformName)s": "Asztali %(brand)s: (%(platformName)s)"
 }
--- a/src/i18n/strings/hy.json
+++ b/src/i18n/strings/hy.json
@@ -2,7 +2,6 @@
    "Explore rooms": "Փնտրել սենյակներ",
    "Failed to start": "Չի ստացվում սկսել",
    "Use %(brand)s on mobile": "Օգտագործում է %(brand)s հեռախոսի վրա",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s%(osName)s",
    "Unknown device": "Անծանոթ սարք",
    "Welcome to Element": "Բարի գալուստ Element",
    "Your browser can't run %(brand)s": "Ձեր բրաուզերը չի թողարկում %(brand)s",
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -18,8 +18,6 @@
    "Unsupported browser": "Peramban tidak didukung",
    "Use %(brand)s on mobile": "Gunakan %(brand)s di ponsel",
    "Powered by Matrix": "Diberdayakan oleh Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Open": "Buka",
    "Download Completed": "Unduhan Selesai",
    "Unexpected error preparing the app. See console for details.": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.",
@@ -28,5 +26,7 @@
    "The message from the parser is: %(message)s": "Pesan dari pengurai adalah: %(message)s",
    "Your Element is misconfigured": "Anda salah mengatur Element",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurasi tidak absah: hanya bisa menentukan satu dari default_server_config, default_server_name, atau default_hs_url.",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Obrolan &amp; kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Obrolan &amp; kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s di %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -11,7 +11,6 @@
    "The message from the parser is: %(message)s": "Skilaboðið frá þáttaranum er %(message)s",
    "Invalid JSON": "Ógilt JSON",
    "Download Completed": "Niðurhali lokið",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Þú ættir að setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> til að fá sem besta útkomu.",
    "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
    "Go to element.io": "Fara á element.io",
@@ -21,7 +20,6 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af vafranum þínum.",
    "Powered by Matrix": "Keyrt með Matrix",
    "Go to your browser to complete Sign In": "Farðu í vafrann þinn til að ljúka innskráningu",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop fyrir vinnutölvur (%(platformName)s)",
    "Unable to load config file: please refresh the page to try again.": "Ekki er hægt að hlaða stillingaskrána: endurnýjaðu síðuna til að reyna aftur.",
    "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",
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "JSON non valido",
    "Go to your browser to complete Sign In": "Vai nel tuo browser per completare l'accesso",
    "Unable to load config file: please refresh the page to try again.": "Impossibile caricare il file di configurazione: ricarica la pagina per riprovare.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Browser non supportato",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
    "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.": "Puoi comunque usare il browser attuale, ma alcune o tutte le caratteristiche potrebbero non funzionare e l'aspetto dell'applicazione potrebbe essere sbagliato.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funzionalità avanzate del browser che non sono supportate dal tuo browser attuale.",
    "Powered by Matrix": "Offerto da Matrix",
    "Use %(brand)s on mobile": "Usa %(brand)s su mobile",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo"
+    "Decentralised, encrypted chat &amp; 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"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -16,9 +16,7 @@
    "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました：ページを再読み込みして、もう一度やり直してください。",
    "Download Completed": "ダウンロードが完了しました",
    "Open": "開く",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)sデスクトップ版（%(platformName)s）",
    "Go to your browser to complete Sign In": "ブラウザーに移動してサインインを完了してください",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s（%(browserName)s、%(osName)s）",
    "Unsupported browser": "サポートされていないブラウザー",
    "Go to element.io": "element.ioへ移動",
    "Failed to start": "起動に失敗しました",
@@ -27,5 +25,8 @@
    "Your browser can't run %(brand)s": "このブラウザーでは%(brand)sが動きません",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザーの高度な機能を使う必要がありますが、このブラウザーではその機能がサポートされていないようです。",
    "Powered by Matrix": "Powered by Matrix",
-    "Use %(brand)s on mobile": "携帯端末で%(brand)sを使用できます"
+    "Use %(brand)s on mobile": "携帯端末で%(brand)sを使用できます",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo による、分散型で暗号化された会話とコラボレーション",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s： %(osName)sの%(browserName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)sデスクトップ：%(platformName)s"
 }
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -4,9 +4,7 @@
    "Invalid JSON": ".i le veirdjeisano na drani",
    "Download Completed": ".i mo'u kibycpa",
    "Open": "nu viska",
-    "%(brand)s Desktop (%(platformName)s)": ".i la'o zoi. %(brand)s .zoi samtci .i le vanbi na kibrbrauzero .i la'o zoi. %(platformName)s .zoi samcmu",
    "Go to your browser to complete Sign In": ".i do ka'e pilno pa kibrbrauzero lo nu mo'u co'a jaspu",
-    "%(appName)s (%(browserName)s, %(osName)s)": ".i la'o zoi. %(appName)s .zoi samtci .i la'o zoi. %(browserName)s .zoi kibrbrauzero .i la'o zoi. %(osName)s .zoi samcmu",
    "Unsupported browser": ".i le kibrbrauzero na kakne",
    "Your browser can't run %(brand)s": ".i na ka'e pilno le kibrbrauzero lo nu pilno la'o zoi. %(brand)s .zoi",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": ".i la'o zoi. %(brand)s .zoi pilno pa na jai se kakne be le kibrbrauzero",
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -5,7 +5,6 @@
    "Explore rooms": "ოთახების დათავლიერება",
    "Failed to start": "ჩართვა ვერ მოხერხდა",
    "Use %(brand)s on mobile": "გამოიყენე %(brand)s-ი მობილურზე",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s დესკტოპი (%(platformName)s)",
    "Unexpected error preparing the app. See console for details.": "მოულოდნელი ერორი აპლიკაციის შემზადებისას. იხილეთ კონსოლი დეტალებისთვის.",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "თქვენი Element-ის კონფიგურაცია შეიცავს მიუღებელ JSON-ს. გთხოვთ გადაჭრათ პრობლემა და დაარაფრეშოთ გვერდი.",
    "Sign In": "შესვლა",
@@ -20,7 +19,6 @@
    "Your Element is misconfigured": "შენი Element-ი არასწორადაა კონფიგურირებული",
    "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> საუკეთესო გამოცდილებისთვის.",
    "Powered by Matrix": "მუშაობს Matrix-ის მეშვეობით",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Go to your browser to complete Sign In": "გახსენი ბრაუზერი Sign In-ის დასასრულებლად",
    "Open": "გახსნა",
    "Download Completed": "გადმოწერა დასრულებულია"
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -1,9 +1,7 @@
 {
    "Invalid JSON": "JSON armeɣtu",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s n tnarit (%(platformName)s)",
    "Go to your browser to complete Sign In": "Ddu ɣer iminig akken ad tkemleḍ ajerred",
    "Unknown device": "Ibenk arussin",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Create Account": "Rnu amiḍan",
    "Dismiss": "Agwi",
    "Sign In": "Kcem",
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -11,9 +11,7 @@
    "Create Account": "계정 만들기",
    "Explore rooms": "방 검색",
    "Unable to load config file: please refresh the page to try again.": "설정 파일을 불러오는 데 실패: 페이지를 새로고침한 후에 다시 시도해 주십시오.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 데스크탑 (%(platformName)s)",
    "Go to your browser to complete Sign In": "로그인을 완료하려면 브라우저로 이동해주세요",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "지원되지 않는 브라우저",
    "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.": "현재 사용 중인 브라우저를 계속 사용할 수 있지만, 일부 기능들이 작동하지 않거나 애플리케이션이 올바르게 보여지지 않을 수 있습니다.",
@@ -27,5 +25,8 @@
    "Open": "열기",
    "Download Completed": "다운로드 완료",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "당신의 Element 설정은 유효하지 않은 JSON을 포함합니다. 이 문제를 해결하고 페이지를 새로고침해주세요.",
-    "Your Element is misconfigured": "당신의 Element가 잘못 설정되었습니다"
+    "Your Element is misconfigured": "당신의 Element가 잘못 설정되었습니다",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo 에서 제공하는 탈중앙화되고 암호화된 협업",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(osName)s 의 %(browserName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s 데스크탑: %(platformName)s"
 }
--- a/src/i18n/strings/lb.json
+++ b/src/i18n/strings/lb.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -15,10 +15,8 @@
    "Unsupported browser": "ບໍ່ຮັບຮອງເວັບບຣາວເຊີນີ້",
    "Use %(brand)s on mobile": "ໃຊ້ມືຖື %(brand)s",
    "Powered by Matrix": "ສະໜັບສະໜູນໂດຍ Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unknown device": "ທີ່ບໍ່ຮູ້ຈັກອຸປະກອນນີ້",
    "Go to your browser to complete Sign In": "ໄປທີ່ໜ້າເວັບຂອງທ່ານເພື່ອເຂົ້າສູ່ລະບົບ",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s ຕັ້ງໂຕະ (%(platformName)s)",
    "Dismiss": "ຍົກເລີກ",
    "Download Completed": "ດາວໂຫຼດສຳເລັດແລ້ວ",
    "Unexpected error preparing the app. See console for details.": "ເກີດຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດໃນການກະກຽມແອັບຯ. ເບິ່ງ console ສໍາລັບລາຍລະອຽດ.",
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -12,8 +12,6 @@
    "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ą.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteryje (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nepalaikoma naršyklė",
    "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 galite toliau naudotis savo dabartine naršykle, bet kai kurios arba visos funkcijos gali neveikti ir programos išvaizda bei sąsaja gali būti neteisingai rodoma.",
    "I understand the risks and wish to continue": "Suprantu šią riziką ir noriu tęsti",
@@ -28,5 +26,6 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
    "Powered by Matrix": "Veikia su Matrix",
    "Use %(brand)s on mobile": "Naudoti %(brand)s mobiliajame telefone",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizuotas, užšifruotų pokalbių &amp; bendradarbiavimas, paremtas $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizuotas, užšifruotų pokalbių &amp; bendradarbiavimas, paremtas $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Kompiuteryje: %(platformName)s"
 }
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -25,8 +25,6 @@
    "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",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Galdvirsmas (%(platformName)s)",
    "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"
 }
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -1,7 +1,6 @@
 {
    "Dismiss": "ഒഴിവാക്കുക",
    "Unknown device": "അപരിചിത ഡിവൈസ്",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s%(osName)s",
    "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.": "അസാധുവായ കോൺഫിഗറേഷൻ: സ്ഥിര സെർവർ ഒന്നും വ്യക്തമാക്കിയില്ല.",
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -24,8 +24,6 @@
    "Your Element is misconfigured": "Ditt Element er feilkonfigurert",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vennligst installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevelsen.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruker avanserte nettleserfunksjoner som ikke støttes av din nåværende nettleser.",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
    "Open": "Åpne",
    "Use %(brand)s on mobile": "Bruk %(brand)s på mobil"
 }
--- a/src/i18n/strings/ne.json
+++ b/src/i18n/strings/ne.json
@@ -1,8 +1,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> इंस्टॉल करें।",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s उन्नत ब्राउज़र सुविधाओं का उपयोग करते हैं जो आपके वर्तमान ब्राउज़र द्वारा समर्थित नहीं हैं।",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)",
    "Sign In": "साइन करना",
    "Explore rooms": "रूम का अन्वेषण करें",
    "Create Account": "खाता बनाएं",
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -10,23 +10,23 @@
    "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",
-    "Go to your browser to complete Sign In": "Ga naar uw browser om de aanmelding te voltooien",
-    "Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina alstublieft.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Go to your browser to complete Sign In": "Ga naar je browser om de aanmelding te voltooien",
+    "Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina.",
    "Unsupported browser": "Niet-ondersteunde browser",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
-    "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.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
+    "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.": "Je kan je huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
    "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan",
    "Go to element.io": "Ga naar element.io",
    "Failed to start": "Opstarten mislukt",
    "Open": "Openen",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jouw Element configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.",
    "Download Completed": "Download voltooid",
-    "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
-    "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet starten",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
+    "Your Element is misconfigured": "Jouw Element is verkeerd geconfigureerd",
+    "Your browser can't run %(brand)s": "Jouw browser kan %(brand)s niet starten",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in je huidige browser.",
    "Powered by Matrix": "Mogelijk gemaakt door Matrix",
-    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo"
+    "Use %(brand)s on mobile": "Gebruik %(brand)s op je mobiel",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s op %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
 }
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -16,14 +16,12 @@
    "Unsupported browser": "Nettlesaren er ikkje støtta",
    "Your browser can't run %(brand)s": "Din nettlesar kan ikkje køyra %(brand)s",
    "Go to element.io": "Gå til element.io",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "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.": "Du kan fortsetja å bruka gjeldande nettlesar, men nokre eller alle funksjonane fungerer kanskje ikkje, og utsjånaden og kjensla av applikasjonen kan vera feil.",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevinga.",
    "I understand the risks and wish to continue": "Eg forstår risikoen og ynskjer å fortsetja",
    "%(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",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
    "Your Element is misconfigured": "Element er feilkonfigurert",
    "Failed to start": "Klarte ikkje å starta",
    "Open": "Opna",
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -20,8 +20,6 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza de foncions avançadas que lo vòstre navigator non suporta pas.",
    "Unsupported browser": "Navigator incompatible",
    "Powered by Matrix": "Fonciona ambé Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s de burèu (%(platformName)s)",
    "Open": "Dobrir",
    "Download Completed": "Descargament acabat",
    "Unable to load config file: please refresh the page to try again.": "Se pòt pas cargar lo fichièr de configuracion : si vos plai actualizatz la pagina per tornar ensajar.",
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -12,8 +12,6 @@
    "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.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Niewspierana przeglądarka",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania.",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Możesz kontynuować używając obecnej przeglądarki, lecz niektóre lub wszystkie funkcje mogą nie działać oraz wygląd aplikacji może być niepoprawny.",
@@ -28,8 +26,5 @@
    "Your Element is misconfigured": "Twój Element jest nieprawidłowo skonfigurowany",
    "Powered by Matrix": "Zasilane przez Matrix",
    "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie",
-    "Switch to space by number": "Przełącz na przestrzeń według numeru",
-    "Next recently visited room or community": "Następne ostatnio odwiedzone pokoje i społeczności",
-    "Previous recently visited room or community": "Ostatnio odwiedzone pokoje i społeczności",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Zdecentralizowany, szyfrowany czat i współpraca oparte na $matrixLogo"
 }
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -17,7 +17,6 @@
    "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 is misconfigured": "O Element está configurado incorretamente",
    "Powered by Matrix": "Desenvolvido por Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (2%(browserName)s, 3%(osName)s)",
    "Go to element.io": "Visite element.io",
    "I understand the risks and wish to continue": "Compreendo os riscos e pretendo continuar",
    "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.": "Podes continuar a utilizar teu browser atual, mas algumas funcionalidades podem não funcionar ou aparecerem de forma incorrecta.",
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -12,7 +12,6 @@
    "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 config: por favor atualize a página para tentar de novo.",
    "Download Completed": "Download Completado",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Browser insuportado",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para a melhor experiência.",
    "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.": "Você pode continuar usando seu browser atual, mas alguma ou toda funcionalidade pode não funcionar e a aparência e sensação do aplicativo pode estar incorretas.",
@@ -20,7 +19,6 @@
    "Go to element.io": "Ir para element.io",
    "Failed to start": "Falha para iniciar",
    "Open": "Abrir",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Go to your browser to complete Sign In": "Vá para seu browser para completar Sign In",
    "Your Element is misconfigured": "Seu Element está malconfigurado",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração de Element contém JSON inválido. Por favor corrija o problema e recarregue a página.",
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -1,31 +1,32 @@
 {
-    "Unknown device": "Device necunoscut",
+    "Unknown device": "Dispozitiv necunoscut",
    "Dismiss": "Închide",
-    "Welcome to Element": "Bun venit pe Element",
-    "Sign In": "Autentificare",
-    "Create Account": "Crează un cont",
+    "Welcome to Element": "Bine ai venit pe Element",
+    "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.": "Configuratie invalida: se poate specifica doar una dintre 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.": "Configurație invalidă: se poate specifica doar una dintre default_server_config, default_server_name, sau default_hs_url.",
    "Invalid JSON": "JSON invalid",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Acest browser nu este suportat",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalati va rog <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> pentru o experienta mai buna.",
-    "I understand the risks and wish to continue": "Inteleg riscul si doresc sa continui",
-    "Go to element.io": "Acceseaza element.io",
-    "Failed to start": "Nu reuseste sa porneasca",
+    "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ță.",
+    "I understand the risks and wish to continue": "Ințeleg riscurile și doresc să continui",
+    "Go to element.io": "Accesează element.io",
+    "Failed to start": "Inițializare eșuată",
    "Your Element is misconfigured": "Element-ul tău este configurat necorespunzător",
-    "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.": "Poți continua să folosești browser-ul curent, însă aspectul și experiența câtorva sau tuturor funcțiilor poate fi incorectă.",
+    "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.": "Poți continua să folosești browser-ul curent, însă unele sau toate funcționalitățile pot să nu meargă, iar aspectul și experiența în aplicație pot fi incorecte.",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s folosește funcții avansate de browser ce nu sunt suportate de browser-ul dumneavoastră.",
-    "Your browser can't run %(brand)s": "Browserul tău nu poate rula %(brand)s",
+    "Your browser can't run %(brand)s": "Browser-ul tău nu poate rula %(brand)s",
    "Use %(brand)s on mobile": "Folosește %(brand)s pe mobil",
-    "Powered by Matrix": "Bazat pe Matrix",
-    "Go to your browser to complete Sign In": "Du-te la browser pentru a finaliza Autentificarea",
+    "Powered by Matrix": "Cu ajutorul Matrix",
+    "Go to your browser to complete Sign In": "Deschide în browser pentru a finaliza Autentificarea",
    "Open": "Deschide",
    "Download Completed": "Descărcare Completă",
    "Unexpected error preparing the app. See console for details.": "Eroare neașteptată în aplicație. Vezi consola pentru detalii.",
-    "Unable to load config file: please refresh the page to try again.": "Nu se poate încărca fișierul de configurație: vă rugăm sa reîncărcați pagina și să încercați din nou.",
+    "Unable to load config file: please refresh the page to try again.": "Nu se poate încărca fișierul de configurație: vă rugăm să reîncărcați pagina și să încercați din nou.",
    "The message from the parser is: %(message)s": "Mesajul de la parser este: %(message)s",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Configurația ta Element conține JSON invalid. Vă rugăm sa corectați problema și să reîncărcați pagina.",
-    "Invalid configuration: no default server specified.": "Configurație invalidă: niciun server implicit specificat."
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Configurația ta Element conține JSON invalid. Vă rugăm să corectați problema și să reîncărcați pagina.",
+    "Invalid configuration: no default server specified.": "Configurație invalidă: niciun server implicit nu este specificat.",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s pe %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat &amp; colaborare descentralizate și criptate cu ajutorul $matrixLogo"
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "Неверный JSON",
    "Go to your browser to complete Sign In": "Перейдите в браузер для завершения входа",
    "Unable to load config file: please refresh the page to try again.": "Не удалось загрузить файл конфигурации. Попробуйте обновить страницу.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s десктоп (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Неподдерживаемый браузер",
    "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.": "Вы можете продолжать пользоваться этим браузером, но некоторые возможности будут недоступны и интерфейс может быть отрисован неправильно.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s использует расширенные возможности, которые не поддерживаются вашим браузером.",
    "Powered by Matrix": "На технологии Matrix",
    "Use %(brand)s on mobile": "Воспользуйтесь %(brand)s на мобильном телефоне",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализованное, зашифрованное общение и сотрудничество на основе $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализованное, зашифрованное общение и сотрудничество на основе $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Рабочий стол: %(platformName)s",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s"
 }
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -1,6 +1,5 @@
 {
    "Unknown device": "නොදන්නා උපාංගයකි",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
    "Open": "විවෘත කරන්න",
    "Powered by Matrix": "මැට්‍රික්ස් මඟින් බලගන්වා ඇත",
@@ -27,6 +26,5 @@
    "I understand the risks and wish to continue": "අවදානම වැටහේ, ඉදිරියට යාමට කැමැත්තෙමි",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "විමධ්‍යගත, සංකේතිත කතාබහ සහ amp; $matrixLogo මගින් බලගැන්වූ සහයෝගිත්වය",
    "Use %(brand)s on mobile": "දුරකථනය සඳහා %(brand)s",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s වැඩතලය (%(platformName)s)",
    "Invalid JSON": "JSON වලංගු නොවේ"
 }
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -12,8 +12,6 @@
    "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",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nepodporovaný prehliadač",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Prosím, nainštalujte si <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink> pre najlepší zážitok.",
    "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.",
@@ -28,5 +26,7 @@
    "%(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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Stolný počítač: %(platformName)s"
 }
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -15,9 +15,7 @@
    "Unexpected error preparing the app. See console for details.": "Nepričakovana napaka pri pripravi aplikacije: Za več poglejte konzolo.",
    "Download Completed": "Prenos zaključen",
    "Open": "Odpri",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s namizje za (%(platformName)s)",
    "Go to your browser to complete Sign In": "Nadaljujte s prijavo v spletnem brskalniku",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Poganja Matrix",
    "Unsupported browser": "Nepodprt brskalnik",
    "Your browser can't run %(brand)s": "Vaš brskalnik ne more poganjati %(brand)s",
@@ -27,5 +25,8 @@
    "I understand the risks and wish to continue": "Razumem riziko 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"
+    "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"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "JSON i pavlefshëm",
    "Go to your browser to complete Sign In": "Që të plotësoni Hyrjen, kaloni te shfletuesi juaj",
    "Unable to load config file: please refresh the page to try again.": "S’arrihet të ngarkohet kartelë formësimesh: ju lutemi, rifreskoni faqen dhe riprovoni.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Shfletues i pambuluar",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ju lutemi, për funksionimin më të mirë, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
    "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.": "Mund të vazhdoni të përdorni shfletuesin tuaj të tanishëm, por disa ose krejt veçoritë mund të mos funksionojnë dhe pamja dhe ndjesitë prej aplikacionit të mos jenë të sakta.",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s përdor veçori të thelluara të shfletuesit, të cilat shfletuesi juaj i tanishëm s’i mbulon.",
    "Powered by Matrix": "Bazuar në Matrix",
    "Use %(brand)s on mobile": "Përdor %(brand)s në celular",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s për Desktop: %(platformName)s",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s në %(osName)s"
 }
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -15,9 +15,7 @@
    "Unable to load config file: please refresh the page to try again.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.",
    "Download Completed": "Преузимање завршено",
    "Open": "Отвори",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s радна површ (%(platformName)s)",
    "Go to your browser to complete Sign In": "Отворите ваш прегледач за довршавање пријаве",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Неподржан прегледач",
    "Your browser can't run %(brand)s": "Ваш прегледач не може покретати %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s користи напредне могућности које нису подржане у вашем тренутном прегледачу.",
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -12,8 +12,6 @@
    "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.",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s skrivbord (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Webbläsaren stöds ej",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installera <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> för den bästa upplevelsen.",
    "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.": "Du kan fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och utseendet och känslan av applikationen kan var felaktig.",
@@ -28,5 +26,7 @@
    "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare.",
    "Use %(brand)s on mobile": "Använd %(brand)s på mobilen",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt &amp; samarbete som drivs av $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt &amp; 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"
 }
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -20,13 +20,13 @@
    "Your browser can't run %(brand)s": "உங்கள் உலாவியில் %(brand)s ஐ இயக்க முடியாது",
    "Unsupported browser": "ஆதரிக்கப்படாத உலாவி",
    "Use %(brand)s on mobile": "%(brand)s ஐ திறன்பேசியில் பயன்படுத்தவும்",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Go to your browser to complete Sign In": "உள்நுழைவை முடிவுசெய்ய உங்கள் உலாவிக்குச் செல்லவும்",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s திரைமுகப்பு (%(platformName)s)",
    "Open": "திற",
    "Download Completed": "பதிவிறக்கம் முடிவடைந்தது",
    "Unable to load config file: please refresh the page to try again.": "கட்டமைப்பு கோப்பை ஏற்ற முடியவில்லை: மீண்டும் முயற்சிக்க பக்கத்தைப் புதுப்பிக்கவும்.",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "உங்கள் எலிமெண்ட் உள்ளமைவில் தவறான JSON உள்ளது. தயவுசெய்து இதை சரிசெய்து பக்கத்தை மீண்டும் ஏற்றவும்.",
    "Your Element is misconfigured": "உங்கள் எலிமெண்ட் தவறாக உள்ளமைக்கப்பட்டுள்ளது",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "மேட்ரிக்ஸ் இனால் செயற்படுத்தபடுகின்ற பரவலாக்கப்பட்ட, மறைகுறியாக்கப்பட்ட , உரையாடல் மற்றும் ஒத்துழைப்பு பயன்பாட்டை"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "மேட்ரிக்ஸ் இனால் செயற்படுத்தபடுகின்ற பரவலாக்கப்பட்ட, மறைகுறியாக்கப்பட்ட , உரையாடல் மற்றும் ஒத்துழைப்பு பயன்பாட்டை",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s இல் %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s டெஸ்க்டாப்: %(platformName)s"
 }
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -9,6 +9,5 @@
    "Create Account": "ఖాతా తెరువు",
    "Open": "తెరువు",
    "Download Completed": "దిగుమతి పూర్తయినది",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s డస్కటాప్ (%(platformName)s)",
    "Unexpected error preparing the app. See console for details.": "ఆప్ ని తయారు చేసే ప్రక్రియాలో అనుకోని లోపం తలెత్తింది. మరిన్ని వివరాల కోసం కాన్సోల్ ను చూడండి."
 }
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -20,6 +20,5 @@
    "I understand the risks and wish to continue": "ฉันเข้าใจความเสี่ยง และดำเนินการต่อ",
    "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 browser can't run %(brand)s": "เบราว์เซอร์ของคุณไม่สามารถใช้งาน %(brand)s ได้",
-    "Unsupported browser": "เบราว์เซอร์ไม่รองรับ",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
+    "Unsupported browser": "เบราว์เซอร์ไม่รองรับ"
 }
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -24,8 +24,6 @@
    "Go to element.io": "element.io adresine git",
    "Failed to start": "Başlatılamadı",
    "Powered by Matrix": "Gücünü Matrix'ten alır",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)  (%(browserName), %(osName))",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
    "Open": "Aç",
    "Use %(brand)s on mobile": "Mobilde %(brand)s kullan",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo tarafından merkeziyetsiz, şifrelenmiş sohbet &amp; iş birliği"
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -6,7 +6,6 @@
    "Go to your browser to complete Sign In": "Ddu ɣer umessara fad ad tsemded azemmem",
    "Welcome to Element": "Azul g Element",
    "Go to element.io": "Ddu ɣer element.io",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unknown device": "Allal arussin",
    "Dismiss": "Nexxel",
    "Open": "Ṛẓem",
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -21,12 +21,12 @@
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфігурація Element містить хибний JSON. Виправте проблему та оновіть сторінку.",
    "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку, щоб спробувати знову.",
    "Open": "Відкрити",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Go to your browser to complete Sign In": "Перейдіть у ваш браузер щоб завершити вхід",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Працює на Matrix",
    "Your browser can't run %(brand)s": "Ваш браузер не може запустити %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує.",
    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s"
 }
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -19,13 +19,11 @@
    "Your browser can't run %(brand)s": "Trình duyệt của bạn không thể chạy %(brand)s",
    "Unsupported browser": "Trình duyệt không được hỗ trợ",
    "Go to your browser to complete Sign In": "Mở trình duyệt web để hoàn thành đăng nhập",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Máy tính để bàn (%(platformName)s)",
    "Open": "Mở",
    "Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy tải lại trang để thử lại.",
    "Failed to start": "Khởi động thất bại",
    "Use %(brand)s on mobile": "Sử dụng %(brand)s trên di động",
    "Powered by Matrix": "Được chạy trên giao thức Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn chứa JSON không hợp lệ. Vui lòng sửa vấn đề và tải lại trang.",
    "Your Element is misconfigured": "Element của bạn bị thiết lập sai",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dịch vụ chat &amp; liên lạc đã được mã hóa, phi tập trung. Được cung cấp bởi $matrixLogo"
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -11,9 +11,7 @@
    "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.": "无法加载配置文件：请刷新页面以重试。",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 桌面版（%(platformName)s）",
    "Go to your browser to complete Sign In": "转到您的浏览器以完成登录",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s（%(browserName)s，%(osName)s）",
    "Unsupported browser": "不支持的浏览器",
    "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.": "您可以继续使用您目前的浏览器，但部分或全部功能可能无法正常工作，应用程序的外观可能也看起来不正确。",
@@ -28,6 +26,5 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "当前浏览器不支持 %(brand)s 所需的高级浏览器特性。",
    "Powered by Matrix": "由 Matrix 驱动",
    "Use %(brand)s on mobile": "在移动设备上使用 %(brand)s",
-    "Switch to space by number": "按数字切换空间",
    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天与协作，由 $matrixLogo 驱动"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -12,8 +12,6 @@
    "Invalid JSON": "無效的 JSON",
    "Go to your browser to complete Sign In": "到您的瀏覽器完成登入",
    "Unable to load config file: please refresh the page to try again.": "無法載入設定檔：請重新整理頁面以再試一次。",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 桌面版 (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "不支援的瀏覽器",
    "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.": "您可以繼續使用您目前的瀏覽器，但部份或全部的功能可能會無法運作，而應用程式的外觀與感覺可能也會不正確。",
@@ -28,5 +26,7 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s 使用了您目前的瀏覽器不支援的進階瀏覽器功能。",
    "Powered by Matrix": "由 Matrix 提供",
    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天與協作，威力本源 $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天與協作，威力本源 $matrixLogo",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s：%(browserName)s 在 %(osName)s 上",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s"
 }
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -21,7 +21,7 @@ limitations under the License.
 // To ensure we load the browser-matrix version first
 import "matrix-js-sdk/src/browser-index";

-import React from 'react';
+import React, { ReactElement } from 'react';
 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
 import { _td, newTranslatableError } from 'matrix-react-sdk/src/languageHandler';
 import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
@@ -55,7 +55,7 @@ window.matrixLogger = logger;
 // 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: object) {
+function makeRegistrationUrl(params: object): string {
    let url;
    if (window.location.protocol === "vector:") {
        url = 'https://app.element.io/#/register';
@@ -81,7 +81,7 @@ function makeRegistrationUrl(params: object) {
    return url;
 }

-function onTokenLoginCompleted() {
+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.
@@ -93,7 +93,7 @@ function onTokenLoginCompleted() {
    window.history.replaceState(null, "", url.href);
 }

-export async function loadApp(fragParams: {}) {
+export async function loadApp(fragParams: {}): Promise<ReactElement> {
    initRouting();
    const platform = PlatformPeg.get();

--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -25,17 +25,17 @@
    <meta property="og:image" content="<%= og_image_url %>" />
    <meta http-equiv="Content-Security-Policy" content="
        default-src 'none';
-        style-src 'self' 'unsafe-inline';
-        script-src 'self' 'unsafe-eval' https://www.recaptcha.net https://www.gstatic.com;
+        style-src 'self' 'unsafe-inline' <%= csp_extra_source %>;
+        script-src 'self' 'unsafe-eval' https://www.recaptcha.net https://www.gstatic.com <%= csp_extra_source %>;
        img-src * blob: data:;
        connect-src *;
-        font-src 'self' data:;
+        font-src 'self' data: <%= csp_extra_source %>;
        media-src * blob: data:;
        child-src * blob: data:;
-        worker-src 'self' blob:;
+        worker-src 'self' blob: <%= csp_extra_source %>;
        frame-src * blob: data:;
-        form-action 'self';
-        manifest-src 'self';
+        form-action 'self' <%= csp_extra_source %>;
+        manifest-src 'self' <%= csp_extra_source %>;
    ">
    <% for (var i=0; i < htmlWebpackPlugin.files.css.length; i++) {
        var file = htmlWebpackPlugin.files.css[i];
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -40,7 +40,7 @@ require('katex/dist/katex.css');
 require('./devcss');
 require('./localstorage-fix');

-async function settled(...promises: Array<Promise<any>>) {
+async function settled(...promises: Array<Promise<any>>): Promise<void> {
    for (const prom of promises) {
        try {
            await prom;
@@ -50,7 +50,7 @@ async function settled(...promises: Array<Promise<any>>) {
    }
 }

-function checkBrowserFeatures() {
+function checkBrowserFeatures(): boolean {
    if (!window.Modernizr) {
        logger.error("Cannot check features - Modernizr global is missing.");
        return false;
@@ -77,16 +77,16 @@ function checkBrowserFeatures() {
    const featureList = Object.keys(window.Modernizr);

    let featureComplete = true;
-    for (let i = 0; i < featureList.length; i++) {
-        if (window.Modernizr[featureList[i]] === undefined) {
+    for (const feature of featureList) {
+        if (window.Modernizr[feature] === undefined) {
            logger.error(
                "Looked for feature '%s' but Modernizr has no results for this. " +
-                "Has it been configured correctly?", featureList[i],
+                "Has it been configured correctly?", feature,
            );
            return false;
        }
-        if (window.Modernizr[featureList[i]] === false) {
-            logger.error("Browser missing feature: '%s'", featureList[i]);
+        if (window.Modernizr[feature] === false) {
+            logger.error("Browser missing feature: '%s'", feature);
            // toggle flag rather than return early so we log all missing features rather than just the first.
            featureComplete = false;
        }
@@ -102,7 +102,7 @@ const supportedBrowser = checkBrowserFeatures();
 // We start loading stuff but don't block on it until as late as possible to allow
 // the browser to use as much parallelism as it can.
 // Load parallelism is based on research in https://github.com/vector-im/element-web/issues/12253
-async function start() {
+async function start(): Promise<void> {
    // load init.ts async so that its code is not executed immediately and we can catch any exceptions
    const {
        rageshakePromise,
--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -41,7 +41,7 @@ import { INSTALLED_MODULES } from "../modules";

 export const rageshakePromise = initRageshake();

-export function preparePlatform() {
+export function preparePlatform(): void {
    if (window.electron) {
        logger.log("Using Electron platform");
        PlatformPeg.set(new ElectronPlatform());
@@ -54,7 +54,7 @@ export function preparePlatform() {
    }
 }

-export function setupLogStorage() {
+export function setupLogStorage(): Promise<void> {
    if (SdkConfig.get().bug_report_endpoint_url) {
        return initRageshakeStore();
    }
@@ -62,7 +62,7 @@ export function setupLogStorage() {
    return Promise.resolve();
 }

-export async function loadConfig() {
+export async function loadConfig(): Promise<void> {
    // XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure
    // granular settings are loaded correctly and to avoid duplicating the override logic for the theme.
    //
@@ -112,7 +112,7 @@ export function loadOlm(): Promise<void> {
    });
 }

-export async function loadLanguage() {
+export async function loadLanguage(): Promise<void> {
    const prefLang = SettingsStore.getValue("language", null, /*excludeDefault=*/true);
    let langs = [];

@@ -131,11 +131,11 @@ export async function loadLanguage() {
    }
 }

-export async function loadTheme() {
+export async function loadTheme(): Promise<void> {
    setTheme();
 }

-export async function loadApp(fragParams: {}) {
+export async function loadApp(fragParams: {}): Promise<void> {
    // load app.js async so that its code is not executed immediately and we can catch any exceptions
    const module = await import(
        /* webpackChunkName: "element-web-app" */
@@ -145,7 +145,7 @@ export async function loadApp(fragParams: {}) {
        document.getElementById('matrixchat'));
 }

-export async function showError(title: string, messages?: string[]) {
+export async function showError(title: string, messages?: string[]): Promise<void> {
    const ErrorView = (await import(
        /* webpackChunkName: "error-view" */
        "../async-components/structures/ErrorView")).default;
@@ -153,7 +153,7 @@ export async function showError(title: string, messages?: string[]) {
        document.getElementById('matrixchat'));
 }

-export async function showIncompatibleBrowser(onAccept) {
+export async function showIncompatibleBrowser(onAccept): Promise<void> {
    const CompatibilityView = (await import(
        /* webpackChunkName: "compatibility-view" */
        "../async-components/structures/CompatibilityView")).default;
@@ -161,7 +161,7 @@ export async function showIncompatibleBrowser(onAccept) {
        document.getElementById('matrixchat'));
 }

-export async function loadModules() {
+export async function loadModules(): Promise<void> {
    for (const InstalledModule of INSTALLED_MODULES) {
        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
        // @ts-ignore - we know the constructor exists even if TypeScript can't be convinced of that
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -61,11 +61,11 @@ let widgetApi: WidgetApi;
 let meetApi: any; // JitsiMeetExternalAPI
 let skipOurWelcomeScreen = false;

-const setupCompleted = (async () => {
+const setupCompleted = (async (): Promise<string | void> => {
    try {
        // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with
        // other setup work and therefore do not block.
-        const configPromise = getVectorConfig('..');
+        const configPromise = getVectorConfig();

        // The widget's options are encoded into the fragment to avoid leaking info to the server.
        const widgetQuery = new URLSearchParams(window.location.hash.substring(1));
@@ -102,7 +102,7 @@ const setupCompleted = (async () => {

            const handleAction = (
                action: WidgetApiAction,
-                handler: (request: IWidgetApiRequestData) => void,
+                handler: (request: IWidgetApiRequestData) => Promise<void>,
            ): void => {
                widgetApi.on(`action:${action}`, async (ev: CustomEvent<IWidgetApiRequest>) => {
                    ev.preventDefault();
@@ -223,11 +223,11 @@ const setupCompleted = (async () => {
    }
 })();

-function enableJoinButton() {
-    document.getElementById("joinButton").onclick = () => joinConference();
+function enableJoinButton(): void {
+    document.getElementById("joinButton").onclick = (): void => joinConference();
 }

-function switchVisibleContainers() {
+function switchVisibleContainers(): void {
    inConference = !inConference;

    // Our welcome screen is managed by other code, so just don't switch to it ever
@@ -237,14 +237,14 @@ function switchVisibleContainers() {
    }
 }

-function toggleConferenceVisibility(inConference: boolean) {
+function toggleConferenceVisibility(inConference: boolean): void {
    document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';
    // Video rooms have a separate UI for joining, so they should never show our join button
    document.getElementById("joinButtonContainer").style.visibility =
        (inConference || isVideoChannel) ? 'hidden' : 'unset';
 }

-function skipToJitsiSplashScreen() {
+function skipToJitsiSplashScreen(): void {
    // really just a function alias for self-documenting code
    joinConference();
 }
@@ -254,7 +254,7 @@ function skipToJitsiSplashScreen() {
 *
 * See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
 */
-function createJWTToken() {
+function createJWTToken(): string {
    // Header
    const header = { alg: 'HS256', typ: 'JWT' };
    // Payload
@@ -289,7 +289,7 @@ function createJWTToken() {
    );
 }

-async function notifyHangup(errorMessage?: string) {
+async function notifyHangup(errorMessage?: string): Promise<void> {
    if (widgetApi) {
        // We send the hangup event before setAlwaysOnScreen, because the latter
        // can cause the receiving side to instantly stop listening.
@@ -301,7 +301,7 @@ async function notifyHangup(errorMessage?: string) {
    }
 }

-function closeConference() {
+function closeConference(): void {
    switchVisibleContainers();
    document.getElementById("jitsiContainer").innerHTML = "";

@@ -315,7 +315,7 @@ function closeConference() {
 // audio input it can find, while an input of null instructs it to start muted,
 // and a non-nullish input specifies the label of a specific device to use.
 // Same for video inputs.
-function joinConference(audioInput?: string | null, videoInput?: string | null) {
+function joinConference(audioInput?: string | null, videoInput?: string | null): void {
    let jwt;
    if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
        if (!openIdToken?.access_token) { // eslint-disable-line camelcase
@@ -408,7 +408,7 @@ function joinConference(audioInput?: string | null, videoInput?: string | null)
    meetApi.on("log", onLog);
 }

-const onVideoConferenceJoined = () => {
+const onVideoConferenceJoined = (): void => {
    // Although we set our displayName with the userInfo option above, that
    // option has a bug where it causes the name to be the HTML encoding of
    // what was actually intended. So, we use the displayName command to at
@@ -432,12 +432,12 @@ const onVideoConferenceJoined = () => {
    if (isVideoChannel) meetApi.executeCommand("setTileView", true);
 };

-const onVideoConferenceLeft = () => {
+const onVideoConferenceLeft = (): void => {
    notifyHangup();
    meetApi = null;
 };

-const onErrorOccurred = ({ error }) => {
+const onErrorOccurred = ({ error }): void => {
    if (error.isFatal) {
        // We got disconnected. Since Jitsi Meet might send us back to the
        // prejoin screen, we're forced to act as if we hung up entirely.
@@ -447,12 +447,12 @@ const onErrorOccurred = ({ error }) => {
    }
 };

-const onAudioMuteStatusChanged = ({ muted }) => {
+const onAudioMuteStatusChanged = ({ muted }): void => {
    const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio;
    widgetApi?.transport.send(action, {});
 };

-const onVideoMuteStatusChanged = ({ muted }) => {
+const onVideoMuteStatusChanged = ({ muted }): void => {
    if (muted) {
        // Jitsi Meet always sends a "video muted" event directly before
        // hanging up, which we need to ignore by padding the timeout here,
@@ -466,11 +466,11 @@ const onVideoMuteStatusChanged = ({ muted }) => {
    }
 };

-const updateParticipants = () => {
+const updateParticipants = (): void => {
    widgetApi?.transport.send(ElementWidgetActions.CallParticipants, {
        participants: meetApi.getParticipantsInfo(),
    });
 };

-const onLog = ({ logLevel, args }) =>
+const onLog = ({ logLevel, args }): void =>
    (parent as unknown as typeof global).mx_rage_logger?.log(logLevel, ...args);
--- a/Show More
+++ b/Show More