Merge pull request #1571 from vector-im/revert-1570-dbkr/isroome2ee_refactor

Revert "Refactor useIsRoomE2EE"

.env.example

@@ -3,22 +3,17 @@
 # Environment files are documented here:
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 ####
+# Develop backend settings:
+LIVEKIT_KEY="devkey"
+LIVEKIT_SECRET="secret"
 
 # Used for determining the homeserver to use for short urls etc.
 # VITE_FALLBACK_STUN_ALLOWED=false
 
-# VITE_CUSTOM_THEME=true
+# CSS to be injected into the page for the purpose of custom theming.
-# VITE_THEME_ACCENT=#0dbd8b
+# Generally, writing a custom theme involves overriding Compound design tokens,
-# VITE_THEME_ACCENT_20=#0dbd8b33
+# which are documented here:
-# VITE_THEME_ALERT=#ff5b55
+# https://compound.element.io/?path=/docs/foundations-design-tokens--docs
-# VITE_THEME_ALERT_20=#ff5b5533
+# https://compound.element.io/?path=/docs/tokens-color-palettes--docs
-# VITE_THEME_LINKS=#0086e6
+# https://compound.element.io/?path=/docs/tokens-semantic-colors--docs
-# VITE_THEME_PRIMARY_CONTENT=#ffffff
+# VITE_CUSTOM_CSS=".cpd-theme-dark.cpd-theme-dark { --cpd-color-theme-bg: #101317; }"
-# VITE_THEME_SECONDARY_CONTENT=#a9b2bc
-# VITE_THEME_TERTIARY_CONTENT=#8e99a4
-# VITE_THEME_TERTIARY_CONTENT_20=#8e99a433
-# VITE_THEME_QUATERNARY_CONTENT=#6f7882
-# VITE_THEME_QUINARY_CONTENT=#394049
-# VITE_THEME_SYSTEM=#21262c
-# VITE_THEME_BACKGROUND=#15191e
-# VITE_THEME_BACKGROUND_85=#15191ed9

.eslintrc.cjs

@@ -1,6 +1,16 @@
 module.exports = {
   plugins: ["matrix-org"],
-  extends: ["plugin:matrix-org/react", "plugin:matrix-org/a11y", "prettier"],
+  extends: [
+    "prettier",
+    "plugin:matrix-org/react",
+    "plugin:matrix-org/a11y",
+    "plugin:matrix-org/typescript",
+  ],
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: "module",
+    project: ["./tsconfig.json"],
+  },
   env: {
     browser: true,
     node: true,
@@ -14,7 +24,7 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["src/**/*.{ts,tsx}"],
+      files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
       extends: [
         "plugin:matrix-org/typescript",
         "plugin:matrix-org/react",

.github/workflows/build.yaml

@@ -2,14 +2,14 @@ name: Build
 on:
   pull_request: {}
   push:
-    branches: [main]
+    branches: [livekit, full-mesh]
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Yarn cache
         uses: actions/setup-node@v3
         with:
@@ -23,8 +23,10 @@ jobs:
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          VITE_APP_VERSION: ${{ github.sha }}
+          NODE_OPTIONS: "--max-old-space-size=4096"
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build
           path: dist

.github/workflows/e2e.yml

@@ -0,0 +1,24 @@
+name: Run E2E tests
+on:
+  workflow_run:
+    workflows: ["deploy"]
+    types:
+      - completed
+    branches-ignore:
+      - "livekit"
+jobs:
+  e2e:
+    name: E2E tests runs on Element Call
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out test private repo
+        uses: actions/checkout@v4
+        with:
+          repository: vector-im/static-call-participant
+          ref: refs/heads/main
+          path: static-call-participant
+          token: ${{ secrets.GH_E2E_TEST_TOKEN }}
+      - name: Build E2E Image
+        run: "cd static-call-participant && docker build --no-cache --tag matrixdotorg/chrome-node-static-call-participant:latest ."
+      - name: Run E2E tests in container
+        run: "docker run --rm -v '${{ github.workspace }}/static-call-participant/callemshost-users.txt:/opt/app/callemshost-users.txt' matrixdotorg/chrome-node-static-call-participant:latest ./e2e.sh"

.github/workflows/lint.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Yarn cache
         uses: actions/setup-node@v3
         with:
@@ -19,6 +19,6 @@ jobs:
       - name: i18n
         run: "yarn run i18n:check"
       - name: ESLint
-        run: "yarn run lint:js"
+        run: "yarn run lint:eslint"
       - name: Type check
         run: "yarn run lint:types"

.github/workflows/netlify-fullmesh.yaml

@@ -5,7 +5,7 @@ on:
     types:
       - completed
     branches:
-      - "main"
+      - "full-mesh"
 
 jobs:
   deploy:
@@ -16,7 +16,7 @@ jobs:
     # so we need to check the head repo too in order to not run on PRs from forks
     # We check the branch name again too just for completeness
     # (Is there a nicer way to see if a PR is from a fork?)
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'main'
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'full-mesh'
     steps:
       - name: Create Deployment
         uses: bobheadxi/deployments@v1
@@ -28,10 +28,10 @@ jobs:
           ref: ${{ github.event.workflow_run.head_sha }}
 
       - name: "Download artifact"
-        uses: actions/github-script@v3.1.0
+        uses: actions/github-script@v6.4.1
         with:
           script: |
-            const artifacts = await github.actions.listWorkflowRunArtifacts({
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 run_id: ${{ github.event.workflow_run.id }},
@@ -39,7 +39,7 @@ jobs:
             const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
                 return artifact.name == "build"
             })[0];
-            const download = await github.actions.downloadArtifact({
+            const download = await github.rest.actions.downloadArtifact({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 artifact_id: matchArtifact.id,
@@ -60,7 +60,7 @@ jobs:
 
       - name: Deploy to Netlify
         id: netlify
-        uses: nwtgck/actions-netlify@v1.2.3
+        uses: nwtgck/actions-netlify@v1.2.4
         with:
           publish-dir: dist
           deploy-message: "Deploy from GitHub Actions"

.github/workflows/netlify-livekit.yaml

@@ -0,0 +1,87 @@
+name: Netlify LiveKit
+on:
+  workflow_run:
+    workflows: ["Build"]
+    types:
+      - completed
+    branches:
+      - "livekit"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+    # Important: the 'branches' filter above will match the 'livekit' branch on forks,
+    # so we need to check the head repo too in order to not run on PRs from forks
+    # We check the branch name again too just for completeness
+    # (Is there a nicer way to see if a PR is from a fork?)
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'livekit'
+    steps:
+      - name: Create Deployment
+        uses: bobheadxi/deployments@v1
+        id: deployment
+        with:
+          step: start
+          token: ${{ secrets.GITHUB_TOKEN }}
+          env: livekit-experiment-branch-cd
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: "Download artifact"
+        uses: actions/github-script@v6.4.1
+        with:
+          script: |
+            const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{ github.event.workflow_run.id }},
+            });
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                return artifact.name == "build"
+            })[0];
+            const download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+            });
+            const fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/build.zip', Buffer.from(download.data));
+
+      - name: Extract Artifacts
+        run: unzip -d dist build.zip && rm build.zip
+
+      - name: Add redirects file
+        # We fetch from github directly as we don't bother checking out the repo
+        run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit/config/netlify_redirects > dist/_redirects
+
+      - name: Add config file
+        run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit/config/element_io_preview.json > dist/config.json
+
+      - name: Deploy to Netlify
+        id: netlify
+        uses: nwtgck/actions-netlify@v1.2.4
+        with:
+          publish-dir: dist
+          deploy-message: "Deploy from GitHub Actions"
+          production-branch: livekit
+          production-deploy: true
+          # These don't work because we're in workflow_run
+          enable-pull-request-comment: false
+          enable-commit-comment: false
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: e3b9fa82-c040-4db6-b4bf-42b524d57423
+        timeout-minutes: 1
+
+      - name: Update deployment status
+        uses: bobheadxi/deployments@v1
+        if: always()
+        with:
+          step: finish
+          override: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          env: ${{ steps.deployment.outputs.env }}
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+          env_url: ${{ steps.netlify.outputs.deploy-url }}

.github/workflows/netlify-pr.yaml

@@ -6,6 +6,7 @@ on:
       - completed
     branches-ignore:
       - "main"
+      - "livekit"
 jobs:
   deploy:
     if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
@@ -27,7 +28,7 @@ jobs:
             Exercise caution. Use test accounts.
 
       - id: prdetails
-        uses: matrix-org/pr-details-action@v1.2
+        uses: matrix-org/pr-details-action@v1.3
         with:
           owner: ${{ github.event.workflow_run.head_repository.owner.login }}
           branch: ${{ github.event.workflow_run.head_branch }}

.github/workflows/publish.yaml

@@ -3,6 +3,8 @@ name: Build & publish images to the package registry for tags
 on:
   release:
     types: [published]
+  push:
+    branches: [livekit]
 
 env:
   REGISTRY: ghcr.io
@@ -16,11 +18,15 @@ jobs:
       contents: write # required to upload release asset
       packages: write
     steps:
+      - name: Get current time
+        id: current-time
+        run: echo "unix_time=$(date +'%s')" >> $GITHUB_OUTPUT
+
       - name: Check it out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -39,31 +45,37 @@ jobs:
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          VITE_APP_VERSION: ${{ github.event.release.tag_name }}
+          VITE_APP_VERSION: ${{ github.event.release.tag_name || github.sha }}
 
       - name: Create Tarball
         env:
-          GITHUB_TAG_NAME: ${{ github.event.release.tag_name }}
+          TARBALL_VERSION: ${{ github.event.release.tag_name || github.sha }}
         run: |
-          tar --numeric-owner --transform "s/dist/element-call-${GITHUB_TAG_NAME}/" -cvzf element-call-${GITHUB_TAG_NAME}.tar.gz dist
+          tar --numeric-owner --transform "s/dist/element-call-${TARBALL_VERSION}/" -cvzf element-call-${TARBALL_VERSION}.tar.gz dist
+
       - name: Upload
-        uses: alexellis/upload-assets@0.4.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: '["element-call-${{ github.event.release.tag_name }}.tar.gz"]'
+          path: "./element-call-*.tar.gz"
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,format=short,event=branch
+            type=semver,pattern=v{{version}}
+            type=raw,value=latest-ci,enable={{is_default_branch}}
+            type=raw,value=latest-ci_${{steps.current-time.outputs.unix_time}},enable={{is_default_branch}}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6
+        uses: docker/setup-buildx-action@dedd61cf5d839122591f5027c89bf3ad27691d18
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/test.yaml

@@ -1,13 +1,15 @@
 name: Run jest tests
 on:
   pull_request: {}
+  push:
+    branches: [livekit, full-mesh]
 jobs:
   jest:
     name: Run jest tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Yarn cache
         uses: actions/setup-node@v3
         with:
@@ -16,3 +18,7 @@ jobs:
         run: "yarn install"
       - name: Jest
         run: "yarn run test"
+      - name: Upload to codecov
+        uses: codecov/codecov-action@v3
+        with:
+          flags: unittests

.github/workflows/triage-incoming.yaml

@@ -1,27 +0,0 @@
-name: Move new issues into triage board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  add-to-project:
-    runs-on: ubuntu-latest
-    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_kwDOAM0swc4AH1sa"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.gitignore

@@ -7,3 +7,4 @@ dist-ssr
 .idea/
 public/config.json
 /coverage
+yarn-error.log

.storybook/preview.jsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { addDecorator } from "@storybook/react";
 import { MemoryRouter } from "react-router-dom";
 import { usePageFocusStyle } from "../src/usePageFocusStyle";

README.md

@@ -3,11 +3,13 @@
 [![Chat](https://img.shields.io/matrix/webrtc:matrix.org)](https://matrix.to/#/#webrtc:matrix.org)
 [![Translate](https://translate.element.io/widgets/element-call/-/element-call/svg-badge.svg)](https://translate.element.io/engage/element-call/)
 
-Full mesh group calls powered by [Matrix](https://matrix.org), implementing [MatrixRTC](https://github.com/matrix-org/matrix-spec-proposals/blob/matthew/group-voip/proposals/3401-group-voip.md).
+Group calls with WebRTC that leverage [Matrix](https://matrix.org) and an open-source WebRTC toolkit from [LiveKit](https://livekit.io/).
+
+For prior version of the Element Call that relied solely on full-mesh logic, check [`full-mesh`](https://github.com/vector-im/element-call/tree/full-mesh) branch.
 
 ![A demo of Element Call with six people](demo.jpg)
 
-To try it out, visit our hosted version at [call.element.io](https://call.element.io). You can also find the latest development version continuously deployed to [element-call.netlify.app](https://element-call.netlify.app).
+To try it out, visit our hosted version at [call.element.io](https://call.element.io). You can also find the latest development version continuously deployed to [call.element.dev](https://call.element.dev/).
 
 ## Host it yourself
 
@@ -48,24 +50,18 @@ Element Call requires a homeserver with registration enabled without any 3pid or
 
 Therefore, to use a self-hosted homeserver, this is recommended to be a new server where any user account created has not joined any normal rooms anywhere in the Matrix federated network. The homeserver used can be setup to disable federation, so as to prevent spam registrations (if you keep registrations open) and to ensure Element Call continues to work in case any user decides to log in to their Element Call account using the standard Element app and joins normal rooms that Element Call cannot handle.
 
-### Features
+## Configuration
 
-#### Allow joining group calls without a camera and a microphone
+There are currently two different config files. `.env` holds variables that are used at build time, while `public/config.json` holds variables that are used at runtime. Documentation and default values for `public/config.json` can be found in [ConfigOptions.ts](src/config/ConfigOptions.ts).
 
-You can allow joining a group call without video and audio enabling this feature in your `config.json`:
+## Translation
 
-```json
+If you'd like to help translate Element Call, head over to [translate.element.io](https://translate.element.io/engage/element-call/). You're also encouraged to join the [Element Translators](https://matrix.to/#/#translators:element.io) space to discuss and coordinate translation efforts.
-{
-  ...
-
-  "features": {
-    "feature_group_calls_without_video_and_audio": true
-  }
-}
-```
 
 ## Development
 
+### Frontend
+
 Element Call is built against [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/pull/2553). To get started, clone, install, and link the package:
 
 ```
@@ -90,10 +86,23 @@ You're now ready to launch the development server:
 yarn dev
 ```
 
-## Configuration
+### Backend
 
-There are currently two different config files. `.env` holds variables that are used at build time, while `public/config.json` holds variables that are used at runtime. Documentation and default values for `public/config.json` can be found in [ConfigOptions.ts](src/config/ConfigOptions.ts).
+A docker compose file is provided to start a LiveKit server and auth
+service for development. These use a test 'secret' published in this
+repository, so this must be used only for local development and
+**_never be exposed to the public Internet._**
 
-## Translation
+To use it, add SFU parameter in your local config `./public/config.yml`:
 
-If you'd like to help translate Element Call, head over to [translate.element.io](https://translate.element.io/engage/element-call/). You're also encouraged to join the [Element Translators](https://matrix.to/#/#translators:element.io) space to discuss and coordinate translation efforts.
+```yaml
+"livekit": {
+    "jwt_service_url": "http://localhost:8881"
+  },
+```
+
+Run backend components:
+
+```
+yarn backend
+```

babel.config.cjs

@@ -8,7 +8,12 @@ module.exports = {
         },
       },
     ],
+    [
       "@babel/preset-react",
+      {
+        runtime: "automatic",
+      },
+    ],
     "@babel/preset-typescript",
   ],
   plugins: ["babel-plugin-transform-vite-meta-env"],

backend-docker-compose.yml

@@ -0,0 +1,44 @@
+version: "3.9"
+
+networks:
+  lkbackend:
+
+services:
+  auth-service:
+    image: ghcr.io/vector-im/lk-jwt-service:latest-ci
+    hostname: auth-server
+    ports:
+      - 8881:8080
+    environment:
+      - LIVEKIT_URL=ws://localhost:7880
+      - LIVEKIT_KEY=devkey
+      - LIVEKIT_SECRET=secret
+    deploy:
+      restart_policy:
+        condition: on-failure
+    networks:
+      - lkbackend
+
+  livekit:
+    image: livekit/livekit-server:latest
+    command: --dev --config /etc/livekit.yaml
+    restart: unless-stopped
+    ports:
+      - "7880:7880"
+      - "7881:7881"
+      - "7882:7882"
+      - "50100-50200:50100-50200"
+    volumes:
+      - ./backend/livekit.yaml:/etc/livekit.yaml
+    networks:
+      - lkbackend
+
+  redis:
+    image: redis:6-alpine
+    command: redis-server /etc/redis.conf
+    ports:
+      - 6379:6379
+    volumes:
+      - ./backend/redis.conf:/etc/redis.conf
+    networks:
+      - lkbackend

backend/livekit.yaml

@@ -0,0 +1,26 @@
+port: 7880
+environment: dev
+bind_addresses:
+  - "0.0.0.0"
+rtc:
+  tcp_port: 7881
+  port_range_start: 50100
+  port_range_end: 50200
+  use_external_ip: false
+#redis:
+#    address: redis:6379
+#    username: ""
+#    password: ""
+#    db: 0
+turn:
+  enabled: false
+  domain: localhost
+  cert_file: ""
+  key_file: ""
+  tls_port: 5349
+  udp_port: 443
+  external_tls: true
+keys:
+  devkey: secret
+signal_relay:
+  enabled: true

backend/redis.conf

@@ -0,0 +1,5 @@
+bind 0.0.0.0
+protected-mode yes
+port 6379
+timeout 0
+tcp-keepalive 300

config/config.sample.json

@@ -4,5 +4,6 @@
       "base_url": "https://call.ems.host",
       "server_name": "call.ems.host"
     }
-  }
+  },
+  "eula": "https://static.element.io/legal/online-EULA.pdf"
 }

config/element_io_preview.json

@@ -1,10 +1,13 @@
 {
   "default_server_config": {
     "m.homeserver": {
-      "base_url": "https://call.ems.host",
+      "base_url": "https://call-unstable.ems.host",
-      "server_name": "call.ems.host"
+      "server_name": "call-unstable.ems.host"
     }
   },
+  "livekit": {
+    "livekit_service_url": "https://livekit-jwt.call.element.dev"
+  },
   "posthog": {
     "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
     "api_host": "https://posthog-element-call.element.io"

config/nginx.conf

@@ -21,5 +21,9 @@ server {
         expires 1w;
         add_header Cache-Control "public, no-transform";
     }
+
+    location /apple-app-site-association {
+        default_type application/json;
+    }
 }
 

config/otel_dev/README.md

@@ -0,0 +1,18 @@
+# OpenTelemetry Collector for development
+
+This directory contains a docker compose file that starts a jaeger all-in-one instance
+with an in-memory database, along with a standalone OpenTelemetry collector that forwards
+traces into the jaeger. Jaeger has a built-in OpenTelemetry collector, but it can't be
+configured to send CORS headers so can't be used from a browser. This sets the config on
+the collector to send CORS headers.
+
+This also adds an nginx to add CORS headers to the jaeger query endpoint, such that it can
+be used from webapps like stalk (https://deniz.co/stalk/). The CORS enabled endpoint is
+exposed on port 16687. To use stalk, you should simply be able to navigate to it and add
+http://127.0.0.1:16687/api as a data source.
+
+(Yes, we could enable the OTLP collector in jaeger all-in-one and passed this through
+the nginx to enable CORS too, rather than running a separate collector. There's no reason
+it's done this way other than that I'd already set up the separate collector.)
+
+Running `docker compose up` in this directory should be all you need.

config/otel_dev/collector-gateway.yaml

@@ -0,0 +1,41 @@
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: 0.0.0.0:4318
+        cors:
+          allowed_origins:
+            # This can't be '*' because opentelemetry-js uses sendBeacon which always operates
+            # in 'withCredentials' mode, which browsers don't allow with an allow-origin of '*'
+            #- "https://pr976--element-call.netlify.app"
+            - "http://*"
+          allowed_headers:
+            - "*"
+processors:
+  batch:
+    timeout: 1s
+  resource:
+    attributes:
+      - key: test.key
+        value: "test-value"
+        action: insert
+exporters:
+  logging:
+    loglevel: info
+  jaeger:
+    endpoint: jaeger-all-in-one:14250
+    tls:
+      insecure: true
+extensions:
+  health_check:
+  pprof:
+    endpoint: :1888
+  zpages:
+    endpoint: :55679
+service:
+  extensions: [pprof, zpages, health_check]
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch, resource]
+      exporters: [logging, jaeger]

config/otel_dev/docker-compose.yaml

@@ -0,0 +1,29 @@
+version: "2"
+services:
+  # Jaeger
+  jaeger-all-in-one:
+    image: jaegertracing/all-in-one:latest
+    ports:
+      - "16686:16686"
+      - "14268"
+      - "14250"
+  # Collector
+  collector-gateway:
+    image: otel/opentelemetry-collector:latest
+    volumes:
+      - ./collector-gateway.yaml:/etc/collector-gateway.yaml
+    command: ["--config=/etc/collector-gateway.yaml"]
+    ports:
+      - "1888:1888" # pprof extension
+      - "13133:13133" # health_check extension
+      - "4317:4317" # OTLP gRPC receiver
+      - "4318:4318" # OTLP HTTP receiver
+      - "55670:55679" # zpages extension
+    depends_on:
+      - jaeger-all-in-one
+  nginx:
+    image: nginxinc/nginx-unprivileged:latest
+    volumes:
+      - ./nginx_otel.conf:/etc/nginx/conf.d/default.conf:ro
+    ports:
+      - "16687:8080"

config/otel_dev/nginx_otel.conf

@@ -0,0 +1,16 @@
+server {
+    listen       8080;
+    server_name  localhost;
+
+    location / {
+            proxy_pass  http://jaeger-all-in-one:16686/;
+            add_header Access-Control-Allow-Origin *;
+
+            if ($request_method = OPTIONS) {
+                add_header Access-Control-Allow-Origin *;
+                add_header Content-Type text/plain;
+                add_header Content-Length 0;
+                return 204;
+            }
+    }
+}

package.json

@@ -3,24 +3,35 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
+    "build": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
     "serve": "vite preview",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "prettier:check": "prettier -c .",
     "prettier:format": "prettier -w .",
-    "lint": "yarn lint:types && yarn lint:js",
+    "lint": "yarn lint:types && yarn lint:eslint",
-    "lint:js": "eslint --max-warnings 0 src",
+    "lint:eslint": "eslint --max-warnings 0 src",
+    "lint:eslint-fix": "eslint --max-warnings 0 src --fix",
     "lint:types": "tsc",
     "i18n": "node_modules/i18next-parser/bin/cli.js",
     "i18n:check": "node_modules/i18next-parser/bin/cli.js --fail-on-warnings --fail-on-update",
-    "test": "jest"
+    "test": "jest",
+    "backend": "docker-compose -f backend-docker-compose.yml up"
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
+    "@livekit/components-react": "^1.1.0",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
+    "@opentelemetry/api": "^1.4.0",
+    "@opentelemetry/context-zone": "^1.9.1",
+    "@opentelemetry/exporter-jaeger": "^1.9.1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.41.0",
+    "@opentelemetry/instrumentation-document-load": "^0.33.0",
+    "@opentelemetry/instrumentation-user-interaction": "^0.33.0",
+    "@opentelemetry/sdk-trace-web": "^1.9.1",
+    "@radix-ui/react-dialog": "^1.0.4",
+    "@radix-ui/react-visually-hidden": "^1.0.3",
     "@react-aria/button": "^3.3.4",
-    "@react-aria/dialog": "^3.1.4",
     "@react-aria/focus": "^3.5.0",
     "@react-aria/menu": "^3.3.0",
     "@react-aria/overlays": "^3.7.3",
@@ -30,25 +41,26 @@
     "@react-aria/utils": "^3.10.0",
     "@react-spring/web": "^9.4.4",
     "@react-stately/collections": "^3.3.4",
-    "@react-stately/overlays": "^3.1.3",
     "@react-stately/select": "^3.1.3",
     "@react-stately/tooltip": "^3.0.5",
     "@react-stately/tree": "^3.2.0",
     "@sentry/react": "^6.13.3",
     "@sentry/tracing": "^6.13.3",
-    "@types/grecaptcha": "^3.0.4",
-    "@types/sdp-transform": "^2.4.5",
     "@use-gesture/react": "^10.2.11",
+    "@vector-im/compound-design-tokens": "^0.0.5",
+    "@vector-im/compound-web": "^0.4.0",
+    "@vitejs/plugin-basic-ssl": "^1.0.1",
+    "@vitejs/plugin-react": "^4.0.1",
     "classnames": "^2.3.1",
-    "color-hash": "^2.0.1",
     "events": "^3.3.0",
     "i18next": "^21.10.0",
     "i18next-browser-languagedetector": "^6.1.8",
     "i18next-http-backend": "^1.4.4",
+    "livekit-client": "^1.12.3",
     "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#8cbbdaa239e449848e8874f041ef1879c1956696",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#6385c9c0dab8fe67bd3a8992a4777f243fdd1b68",
-    "matrix-widget-api": "^1.0.0",
+    "matrix-widget-api": "^1.3.1",
-    "mermaid": "^8.13.8",
+    "mermaid": "^9.0.0",
     "normalize.css": "^8.0.1",
     "pako": "^2.0.4",
     "postcss-preset-env": "^7",
@@ -58,28 +70,40 @@
     "react-dom": "18",
     "react-i18next": "^11.18.6",
     "react-json-view": "^1.21.3",
-    "react-router": "6",
     "react-router-dom": "^5.2.0",
     "react-use-clipboard": "^1.0.7",
     "react-use-measure": "^2.1.1",
     "sdp-transform": "^2.14.1",
     "tinyqueue": "^2.0.3",
-    "unique-names-generator": "^4.6.0"
+    "unique-names-generator": "^4.6.0",
+    "uuid": "9",
+    "vaul": "^0.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
-    "@sentry/vite-plugin": "^0.3.0",
+    "@react-spring/rafz": "^9.7.3",
+    "@react-types/dialog": "^3.5.5",
+    "@sentry/vite-plugin": "^2.0.0",
     "@storybook/react": "^6.5.0-alpha.5",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
+    "@testing-library/react": "^14.0.0",
+    "@types/content-type": "^1.1.5",
+    "@types/d3": "^7.4.0",
+    "@types/dom-screen-wake-lock": "^1.0.1",
+    "@types/dompurify": "^3.0.2",
+    "@types/grecaptcha": "^3.0.4",
+    "@types/node": "^18.13.0",
+    "@types/react-router-dom": "^5.3.3",
     "@types/request": "^2.48.8",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
+    "@types/sdp-transform": "^2.4.5",
-    "@typescript-eslint/parser": "^5.22.0",
+    "@types/uuid": "9",
-    "babel-loader": "^8.2.3",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
+    "babel-loader": "^9.0.0",
     "babel-plugin-transform-vite-meta-env": "^1.0.3",
     "eslint": "^8.14.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-matrix-org": "^0.4.0",
@@ -89,17 +113,17 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.2.2",
     "jest-environment-jsdom": "^29.3.1",
+    "jest-mock": "^29.5.0",
     "prettier": "^2.6.2",
     "sass": "^1.42.1",
     "storybook-builder-vite": "^0.1.12",
-    "typescript": "^4.6.4",
+    "typescript": "^5.1.6",
-    "typescript-strict-plugin": "^2.0.1",
+    "vite": "^4.2.0",
-    "vite": "^2.4.2",
     "vite-plugin-html-template": "^1.1.0",
-    "vite-plugin-svgr": "^0.4.0"
+    "vite-plugin-svgr": "^3.2.0"
   },
   "jest": {
-    "testEnvironment": "jsdom",
+    "testEnvironment": "./test/environment.ts",
     "testMatch": [
       "<rootDir>/test/**/*-test.[jt]s?(x)"
     ],
@@ -108,9 +132,15 @@
       "/node_modules/(?!internmap)+$"
     ],
     "moduleNameMapper": {
-      "\\.(css|less|svg)+$": "identity-obj-proxy",
+      "\\.css$": "identity-obj-proxy",
+      "\\.svg$": "<rootDir>/test/mocks/svgr.ts",
       "^\\./IndexedDBWorker\\?worker$": "<rootDir>/test/mocks/workerMock.ts",
       "^\\./olm$": "<rootDir>/test/mocks/olmMock.ts"
-    }
+    },
+    "collectCoverage": true,
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ]
   }
 }

public/.well-known/assetlinks.json

@@ -0,0 +1,32 @@
+[
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "io.element.android.x.debug",
+      "sha256_cert_fingerprints": [
+        "B0:B0:51:DC:56:5C:81:2F:E1:7F:6F:3E:94:5B:4D:79:04:71:23:AB:0D:A6:12:86:76:9E:B2:94:91:97:13:0E"
+      ]
+    }
+  },
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "io.element.android.x.nightly",
+      "sha256_cert_fingerprints": [
+        "CA:D3:85:16:84:3A:05:CC:EB:00:AB:7B:D3:80:0F:01:BA:8F:E0:4B:38:86:F3:97:D8:F7:9A:1B:C4:54:E4:0F"
+      ]
+    }
+  },
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "io.element.android.x",
+      "sha256_cert_fingerprints": [
+        "C6:DB:9B:9C:8C:BD:D6:5D:16:E8:EC:8C:8B:91:C8:31:B9:EF:C9:5C:BF:98:AE:41:F6:A9:D8:35:15:1A:7E:16"
+      ]
+    }
+  }
+]

public/apple-app-site-association

@@ -0,0 +1,15 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appIDs": [
+          "7J4U792NQT.io.element.elementx",
+          "7J4U792NQT.io.element.elementx.nightly",
+          "7J4U792NQT.io.element.elementx.pr"
+        ],
+        "paths": ["*"]
+      }
+    ]
+  }
+}

public/index.html

@@ -13,7 +13,7 @@
     </script>
   </head>
 
-  <body>
+  <body class="cpd-theme-dark">
     <div id="root"></div>
   </body>
 </html>

public/locales/bg/app.json

@@ -2,83 +2,48 @@
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Вече имате акаунт?</0><1><0>Влезте с него</0> или <2>Влезте като гост</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Създайте акаунт</0> или <2>Влезте като гост</2>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Защо не настройте парола за да запазите акаунта си?</0><1>Ще можете да запазите името и аватара си за бъдещи разговори</1>",
-  "Accept camera/microphone permissions to join the call.": "Приемете разрешенията за камера/микрофон за да се присъедините в разговора.",
-  "Accept microphone permissions to join the call.": "Приемете разрешението за микрофона за да се присъедините в разговора.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Друг потребител в този разговор има проблем. За да диагностицираме този проблем по-добре ни се иска да съберем debug логове.",
   "Audio": "Звук",
   "Avatar": "Аватар",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Натискайки \"Напред\" се съгласявате с нашите <2>Правила и условия</2>",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Натискайки \"Влез в разговора сега\", се съгласявате с нашите <2>Правила и условия</2>",
-  "Call link copied": "Връзка към разговора бе копирана",
-  "Call type menu": "Меню \"тип на разговора\"",
   "Camera": "Камера",
-  "Camera {{n}}": "Камера {{n}}",
-  "Camera/microphone permissions needed to join the call.": "Необходими са разрешения за камера/микрофон за да се присъедините в разговора.",
-  "Change layout": "Промени изгледа",
   "Close": "Затвори",
   "Confirm password": "Потвърди паролата",
-  "Connection lost": "Връзката се изгуби",
   "Copied!": "Копирано!",
   "Copy and share this call link": "Копирай и сподели връзка към разговора",
   "Create account": "Създай акаунт",
   "Debug log": "Debug логове",
   "Debug log request": "Заявка за debug логове",
-  "Description (optional)": "Описание (незадължително)",
-  "Details": "Детайли",
   "Developer": "Разработчик",
   "Display name": "Име/псевдоним",
   "Download debug logs": "Изтеглете debug логове",
   "Exit full screen": "Излез от цял екран",
-  "Fetching group call timed out.": "Изтече времето за взимане на груповия разговор.",
-  "Freedom": "Свобода",
   "Full screen": "Цял екран",
   "Go": "Напред",
-  "Grid layout menu": "Меню \"решетков изглед\"",
-  "Having trouble? Help us fix it.": "Имате проблем? Помогнете да го поправим.",
   "Home": "Начало",
   "Include debug logs": "Включи debug логове",
-  "Incompatible versions": "Несъвместими версии",
-  "Incompatible versions!": "Несъвместими версии!",
   "Inspector": "Инспектор",
-  "Invite": "Покани",
-  "Invite people": "Покани хора",
   "Join call": "Влез в разговора",
   "Join call now": "Влез в разговора сега",
   "Join existing call?": "Присъединяване към съществуващ разговор?",
-  "Leave": "Напусни",
-  "Loading room…": "Напускане на стаята…",
   "Loading…": "Зареждане…",
   "Local volume": "Локална сила на звука",
   "Logging in…": "Влизане…",
   "Login": "Влез",
   "Login to your account": "Влезте в акаунта си",
   "Microphone": "Микрофон",
-  "Microphone permissions needed to join the call.": "Необходими са разрешения за микрофона за да можете да се присъедините в разговора.",
-  "Microphone {{n}}": "Микрофон {{n}}",
   "More": "Още",
-  "More menu": "Мено \"още\"",
-  "Mute microphone": "Заглуши микрофона",
   "No": "Не",
   "Not now, return to home screen": "Не сега, върни се на началния екран",
   "Not registered yet? <2>Create an account</2>": "Все още не сте регистрирани? <2>Създайте акаунт</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Други потребители се опитват да се присъединят в разговора от несъвместими версии. Следните потребители трябва да проверят дали са презаредили браузърите си<1>{userLis}</1>",
   "Password": "Парола",
   "Passwords must match": "Паролите не съвпадат",
-  "Press and hold spacebar to talk": "Натиснете и задръжте Space за да говорите",
-  "Press and hold spacebar to talk over {{name}}": "Натиснете и задръжте Space за да говорите заедно с {{name}}",
-  "Press and hold to talk": "Натиснете и задръжте за да говорите",
-  "Press and hold to talk over {{name}}": "Натиснете и задръжте за да говорите заедно с {{name}}",
   "Profile": "Профил",
   "Recaptcha dismissed": "Recaptcha отхвърлена",
   "Recaptcha not loaded": "Recaptcha не е заредена",
   "Register": "Регистрация",
   "Registering…": "Регистриране…",
-  "Release spacebar key to stop": "Отпуснете Space за да спрете",
-  "Release to stop": "Отпуснете за да спрете",
   "Remove": "Премахни",
   "Return to home screen": "Връщане на началния екран",
-  "Save": "Запази",
-  "Saving…": "Запазване…",
   "Select an option": "Изберете опция",
   "Send debug logs": "Изпратете debug логове",
   "Sending…": "Изпращане…",
@@ -87,43 +52,14 @@
   "Show call inspector": "Покажи инспектора на разговора",
   "Sign in": "Влез",
   "Sign out": "Излез",
-  "Spatial audio": "Пространствен звук",
   "Speaker": "Говорител",
-  "Speaker {{n}}": "Говорител {{n}}",
   "Spotlight": "Прожектор",
-  "Stop sharing screen": "Спри споделянето на екрана",
   "Submit feedback": "Изпрати обратна връзка",
-  "Submitting feedback…": "Изпращане на обратна връзка…",
-  "Take me Home": "Отиди в Начало",
-  "Talk over speaker": "Говорете заедно с говорителя",
-  "Talking…": "Говорене…",
-  "Thanks! We'll get right on it.": "Благодарим! Веднага ще се заемем.",
   "This call already exists, would you like to join?": "Този разговор вече съществува, искате ли да се присъедините?",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Този сайт се предпазва от ReCAPTCHA и важат <2>Политиката за поверителност</2> и <6>Условията за ползване на услугата</6> на Google.<9></9>Натискайки \"Регистрация\", се съгласявате с нашите <12>Правила и условия</12>",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Това прави звука на говорителя да изглежда, че излиза от мястото където са позиционирани на екрана. (Експериментална функция: може да повлияе на стабилността на звука.)",
-  "Turn off camera": "Изключи камерата",
-  "Turn on camera": "Включи камерата",
-  "Unmute microphone": "Включи микрофона",
-  "User ID": "Потребителски идентификатор",
   "User menu": "Потребителско меню",
   "Username": "Потребителско име",
   "Version: {{version}}": "Версия: {{version}}",
   "Video": "Видео",
-  "Video call": "Видео разговор",
-  "Video call name": "Име на видео разговора",
-  "Waiting for network": "Изчакване на мрежата",
   "Waiting for other participants…": "Изчакване на други участници…",
-  "Walkie-talkie call": "Уоки-токи разговор",
+  "Yes, join call": "Да, присъедини се"
-  "Walkie-talkie call name": "Име на уоки-токи разговора",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC не се поддържа или се блокира от браузъра.",
-  "Yes, join call": "Да, присъедини се",
-  "You can't talk at the same time": "Не можете да говорите едновременно",
-  "Your recent calls": "Скорошните ви разговори",
-  "{{count}} people connected|one": "{{count}} човек се свърза",
-  "{{count}} people connected|other": "{{count}} човека се звързаха",
-  "{{displayName}}, your call is now ended": "{{displayName}}, разговорът ви приключи",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is presenting": "{{name}} презентира",
-  "{{name}} is talking…": "{{name}} говори…",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - уоки-токи разговор"
 }

public/locales/cs/app.json

@@ -1,44 +1,21 @@
 {
   "Copy and share this call link": "Zkopírujte a sdílejte odkaz na hovor",
   "Copied!": "Zkopírováno!",
-  "Connection lost": "Připojení ztraceno",
   "Confirm password": "Potvrdit heslo",
   "Close": "Zavřít",
-  "Change layout": "Změnit rozložení",
-  "Camera/microphone permissions needed to join the call.": "Oprávnění k přístupu ke kameře/mikrofonu jsou nutná pro připojení k hovoru.",
-  "Camera {{n}}": "Kamera {{n}}",
   "Camera": "Kamera",
-  "Call link copied": "Odkaz na hovor zkopírován",
   "Avatar": "Avatar",
   "Audio": "Audio",
-  "Accept microphone permissions to join the call.": "Povolte přístup k mikrofonu pro připojení k hovoru.",
-  "Accept camera/microphone permissions to join the call.": "Povolte přístup ke kameře/mikrofonu pro připojení do hovoru.",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Vytvořit účet</0> Or <2>Jako host</2>",
-  "Your recent calls": "Vaše nedávné hovory",
-  "You can't talk at the same time": "Teď nemůžete mluvit",
   "Yes, join call": "Ano, připojit se",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC není podporováno nebo je zakázáno tímto prohlížečem.",
   "Waiting for other participants…": "Čekání na další účastníky…",
-  "Waiting for network": "Čekání na připojení",
-  "Video call name": "Jméno videohovoru",
-  "Video call": "Videohovor",
   "Video": "Video",
   "Version: {{version}}": "Verze: {{version}}",
   "Username": "Uživatelské jméno",
   "User menu": "Uživatelské menu",
-  "User ID": "ID uživatele",
-  "Unmute microphone": "Zapnout mikrofon",
-  "Turn on camera": "Zapnout kameru",
-  "Turn off camera": "Vypnout kameru",
   "This call already exists, would you like to join?": "Tento hovor již existuje, chcete se připojit?",
-  "Thanks! We'll get right on it.": "Děkujeme! Hned se na to vrhneme.",
-  "Take me Home": "Domovská obrazovka",
-  "Submitting feedback…": "Odesílání zpětné vazby…",
   "Submit feedback": "Dát feedback",
-  "Stop sharing screen": "Zastavit sdílení obrazovek",
-  "Speaker {{n}}": "Reproduktor {{n}}",
   "Speaker": "Reproduktor",
-  "Spatial audio": "Prostorový zvuk",
   "Sign out": "Odhlásit se",
   "Sign in": "Přihlásit se",
   "Show call inspector": "Zobrazit inspektor hovoru",
@@ -48,96 +25,48 @@
   "Sending debug logs…": "Posílání ladícího záznamu…",
   "Send debug logs": "Poslat ladící záznam",
   "Select an option": "Vyberte možnost",
-  "Saving…": "Ukládání…",
-  "Save": "Uložit",
   "Return to home screen": "Vrátit se na domácí obrazovku",
   "Remove": "Odstranit",
   "Registering…": "Registrování…",
   "Register": "Registrace",
   "Profile": "Profil",
-  "Press and hold to talk": "Stiskněte a držte pro mluvení",
-  "Press and hold spacebar to talk": "Stiskněte a držte mezerník pro mluvení",
   "Passwords must match": "Hesla se musí shodovat",
   "Password": "Heslo",
   "Not now, return to home screen": "Teď ne, vrátit se na domovskou obrazovku",
   "No": "Ne",
-  "Mute microphone": "Ztlumit mikrofon",
   "More": "Více",
-  "Microphone permissions needed to join the call.": "Přístup k mikrofonu je nutný pro připojení se k hovoru.",
-  "Microphone {{n}}": "Mikrofon {{n}}",
   "Microphone": "Mikrofon",
-  "Login to your account": "Přihlásit se ke svůmu účtu",
+  "Login to your account": "Přihlásit se ke svému účtu",
   "Login": "Přihlášení",
   "Logging in…": "Přihlašování se…",
   "Local volume": "Lokální hlasitost",
   "Loading…": "Načítání…",
-  "Loading room…": "Načítání místnosti…",
-  "Leave": "Opustit hovor",
   "Join call now": "Připojit se k hovoru",
   "Join call": "Připojit se k hovoru",
-  "Invite people": "Pozvat lidi",
-  "Invite": "Pozvat",
   "Inspector": "Insepktor",
-  "Incompatible versions!": "Nekompatibilní verze!",
-  "Incompatible versions": "Nekompatibilní verze",
-  "{{name}} is talking…": "{{name}} mluví…",
-  "{{name}} is presenting": "{{name}} prezentuje",
-  "{{name}} (Connecting...)": "{{name}} (Připojení...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}, váš hovor je nyní ukončen",
-  "{{count}} people connected|other": "{{count}} lidí připojeno",
-  "{{count}} people connected|one": "{{count}} lidí připojeno",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Tato možnost způsobí, že zvuk účastníků hovoru se bude tvářit jako by přicházel z místa, kde jsou umístěni na obrazovce.(Experimentální možnost: může způsobit nestabilitu audia.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Tato stárnka je chráněna pomocí ReCAPTCHA a Google <2>zásad ochrany osobních údajů</2> a <6>podmínky služby</6> platí.<9></9>Kliknutím na \"Registrovat\", souhlasíte s <12>Pravidly a podmínkami</12>",
-  "Walkie-talkie call name": "Jméno vysílačkového hovoru",
-  "Walkie-talkie call": "Vysílačkový hovor",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Vysílačkový hovor",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Zapnout jedno-klávesové zkratky, např. 'm' pro vypnutí/zapnutí mikrofonu.",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Toto bude odesílat anonymizovaná data (jako délku a počet účastníků hovoru) týmu Element Call, aby nám pomohly zlepšovat aplikaci podle toho, jak je používaná.",
-  "Talking…": "Mluvení…",
-  "Talk over speaker": "Mluvit přes mluvčího",
   "Spotlight": "Soustředěný mód",
-  "Single-key keyboard shortcuts": "Jedno-klávesová klávesnice",
-  "Release to stop": "Pusťte pro ukončení",
-  "Release spacebar key to stop": "Pusťte mezerník pro ukončení",
   "Recaptcha not loaded": "Recaptcha se nenačetla",
   "Recaptcha dismissed": "Recaptcha byla zamítnuta",
-  "Press and hold to talk over {{name}}": "Zmáčkněte a držte, abyste mluvili přes {{name}}",
-  "Press and hold spacebar to talk over {{name}}": "Zmáčkněte a držte mezerník, abyste mluvili přes {{name}}",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Ostatní uživatelé se pokoušejí připojit k tomuto hovoru s nekompatibilních verzí. Tito uživatelé by se měli ujistit, že stránku načetli znovu:<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "Nejste registrovaní? <2>Vytvořit účet</2>",
-  "More menu": "Další možnosti",
   "Join existing call?": "Připojit se k existujícimu hovoru?",
   "Include debug logs": "Zahrnout ladící záznamy",
   "Home": "Domov",
-  "Having trouble? Help us fix it.": "Máte problémy? Pomozte nám je spravit.",
-  "Grid layout menu": "Menu rozložení",
   "Go": "Pokračovat",
   "Full screen": "Zvětšit na celou obrazovku",
-  "Freedom": "Volný",
-  "Fetching group call timed out.": "Vypršel časový limit načítání skupinového hovoru.",
   "Exit full screen": "Ukončit režim celé obrazovky",
   "Element Call Home": "Domov Element Call",
   "Download debug logs": "Stáhnout ladící záznamy",
   "Display name": "Zobrazované jméno",
   "Developer": "Vývojář",
-  "Details": "Detaily",
-  "Description (optional)": "Popis (nepovinný)",
   "Debug log request": "Žádost o protokoly ladění",
   "Debug log": "Protokoly ladění",
   "Create account": "Vytvořit účet",
   "Copy": "Kopírovat",
-  "Call type menu": "Menu typu hovoru",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Kliknutím na \"Připojit se do hovoru\", odsouhlasíte naše <2>Terms and conditions</2>",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Kliknutím na \"Pokračovat\", odsouhlasíte naše <2>Terms and conditions</2>",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Jiný uživatel v tomto hovoru má problémy. Abychom mohli diagnostikovat problém, rádi bychom shromáždili protokoly ladění.",
-  "Allow analytics": "Povolit analytiku",
-  "Advanced": "Pokročilé",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Proč neskončit nastavením hesla, abyste mohli účet použít znovu?</0><1>Budete si moci nechat své jméno a nastavit si avatar pro budoucí hovory </1>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Připojit se</0><1>Or</1><2>Zkopírovat odkaz a připojit se později</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Už máte účet?</0><1><0>Přihlásit se</0> Or <2>Jako host</2></1>",
-  "{{name}} (Waiting for video...)": "{{name}} (Čekání na video...)",
-  "This feature is only supported on Firefox.": "Tato funkce je podporována jen ve Firefoxu.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Odeslání ladících záznamů nám pomůže diagnostikovat problém.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Oops, něco se pokazilo.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Oops, něco se pokazilo.</0>",
+  "Expose developer settings in the settings window.": "Zobrazit vývojářské nastavení.",
+  "Developer Settings": "Vývojářské nastavení"
 }

public/locales/de/app.json

@@ -2,82 +2,48 @@
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Du hast bereits ein Konto?</0><1><0>Anmelden</0> Oder <2>Als Gast betreten</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Konto erstellen</0> Oder <2>Als Gast betreten</2>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Warum vergibst du nicht abschließend ein Passwort, um dein Konto zu erhalten?</0><1>Du kannst deinen Namen behalten und ein Profilbild für zukünftige Anrufe festlegen.</1>",
-  "Accept camera/microphone permissions to join the call.": "Erlaube Zugriff auf Kamera/Mikrofon um dem Anruf beizutreten.",
-  "Accept microphone permissions to join the call.": "Erlaube Zugriff auf das Mikrofon um dem Anruf beizutreten.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ein anderer Benutzer dieses Anrufs hat ein Problem. Um es besser diagnostizieren zu können, würden wir gerne ein Debug-Protokoll erstellen.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Wenn du auf „Los geht’s“ klickst, akzeptierst du unsere <2>Geschäftsbedingungen</2>",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Wenn du auf „Anruf beitreten“ klickst, akzeptierst du unsere <2>Geschäftsbedingungen</2>",
-  "Call link copied": "Anruflink kopiert",
-  "Call type menu": "Anruftyp Menü",
   "Camera": "Kamera",
-  "Camera {{n}}": "Kamera {{n}}",
-  "Camera/microphone permissions needed to join the call.": "Für die Teilnahme am Anruf sind Kamera- und Mikrofonberechtigungen erforderlich.",
-  "Change layout": "Layout ändern",
   "Close": "Schließen",
   "Confirm password": "Passwort bestätigen",
-  "Connection lost": "Verbindung verloren",
   "Copied!": "Kopiert!",
   "Copy and share this call link": "Kopiere und teile diesen Anruflink",
   "Create account": "Konto erstellen",
   "Debug log": "Debug-Protokoll",
   "Debug log request": "Debug-Log Anfrage",
-  "Description (optional)": "Beschreibung (optional)",
-  "Details": "Details",
   "Developer": "Entwickler",
   "Display name": "Anzeigename",
   "Download debug logs": "Debug-Protokolle herunterladen",
   "Exit full screen": "Vollbildmodus verlassen",
-  "Freedom": "Freiraum",
   "Full screen": "Vollbild",
   "Go": "Los geht’s",
-  "Grid layout menu": "Grid-Layout-Menü",
-  "Having trouble? Help us fix it.": "Du hast ein Problem? Hilf uns, es zu beheben.",
   "Home": "Startseite",
   "Include debug logs": "Debug-Protokolle einschließen",
-  "Incompatible versions": "Inkompatible Versionen",
-  "Incompatible versions!": "Inkompatible Versionen!",
   "Inspector": "Inspektor",
-  "Invite": "Einladen",
-  "Invite people": "Personen einladen",
   "Join call": "Anruf beitreten",
   "Join call now": "Anruf beitreten",
   "Join existing call?": "An bestehendem Anruf teilnehmen?",
-  "Leave": "Verlassen",
-  "Loading room…": "Lade Raum …",
   "Loading…": "Lade …",
   "Local volume": "Lokale Lautstärke",
   "Logging in…": "Anmelden …",
   "Login": "Anmelden",
   "Login to your account": "Melde dich mit deinem Konto an",
   "Microphone": "Mikrofon",
-  "Microphone permissions needed to join the call.": "Mikrofon-Berechtigung ist erforderlich, um dem Anruf beizutreten.",
-  "Microphone {{n}}": "Mikrofon {{n}}",
   "More": "Mehr",
-  "More menu": "Weiteres Menü",
-  "Mute microphone": "Mikrofon stummschalten",
   "No": "Nein",
-  "Not now, return to home screen": "Nicht jetzt, zurück zum Startbildschirm",
+  "Not now, return to home screen": "Nicht jetzt, zurück zur Startseite",
   "Not registered yet? <2>Create an account</2>": "Noch nicht registriert? <2>Konto erstellen</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Andere Benutzer versuchen, diesem Aufruf von einer inkompatiblen Softwareversion aus beizutreten. Diese Benutzer sollten ihre Web-Browser Seite neu laden:<1>{userLis}</1>",
   "Password": "Passwort",
   "Passwords must match": "Passwörter müssen übereinstimmen",
-  "Press and hold spacebar to talk": "Halte zum Sprechen die Leertaste gedrückt",
-  "Press and hold spacebar to talk over {{name}}": "Zum Verdrängen von {{name}} und Sprechen die Leertaste gedrückt halten",
-  "Press and hold to talk": "Zum Sprechen gedrückt halten",
-  "Press and hold to talk over {{name}}": "Zum Verdrängen von {{name}} und Sprechen gedrückt halten",
   "Profile": "Profil",
   "Recaptcha dismissed": "Recaptcha abgelehnt",
   "Recaptcha not loaded": "Recaptcha nicht geladen",
   "Register": "Registrieren",
   "Registering…": "Registrierung …",
-  "Release spacebar key to stop": "Leertaste loslassen, um zu stoppen",
-  "Release to stop": "Loslassen zum Stoppen",
   "Remove": "Entfernen",
-  "Return to home screen": "Zurück zum Startbildschirm",
+  "Return to home screen": "Zurück zur Startseite",
-  "Save": "Speichern",
-  "Saving…": "Speichere …",
   "Select an option": "Wähle eine Option",
   "Send debug logs": "Debug-Logs senden",
   "Sending…": "Senden …",
@@ -86,58 +52,75 @@
   "Show call inspector": "Anrufinspektor anzeigen",
   "Sign in": "Anmelden",
   "Sign out": "Abmelden",
-  "Spatial audio": "Räumliche Audiowiedergabe",
   "Speaker": "Wiedergabegerät",
-  "Speaker {{n}}": "Wiedergabegerät {{n}}",
   "Spotlight": "Rampenlicht",
-  "Stop sharing screen": "Beenden der Bildschirmfreigabe",
   "Submit feedback": "Rückmeldung geben",
-  "Submitting feedback…": "Sende Rückmeldung …",
-  "Take me Home": "Zurück zur Startseite",
-  "Talk over speaker": "Aktiven Sprecher verdrängen und sprechen",
-  "Talking…": "Sprechen …",
-  "Thanks! We'll get right on it.": "Vielen Dank! Wir werden uns sofort darum kümmern.",
   "This call already exists, would you like to join?": "Dieser Aufruf existiert bereits, möchtest Du teilnehmen?",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Diese Website wird durch ReCAPTCHA geschützt und es gelten die <2>Datenschutzerklärung</2> und <6>Nutzungsbedingungen</6> von Google.<9></9>Indem Du auf „Registrieren“ klickst, stimmst du unseren <12>Geschäftsbedingungen</12> zu",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Dies wird die Audiowiedergabe eines Sprechers wirken lassen, als käme sie von der Stelle des zugehörigen Videobildes. (Experimentelle Funktion: Dies könnte die Stabilität der Audiowiedergabe beeinträchtigen.)",
-  "Turn off camera": "Kamera ausschalten",
-  "Turn on camera": "Kamera einschalten",
-  "Unmute microphone": "Mikrofon aktivieren",
-  "User ID": "Benutzer-ID",
   "User menu": "Benutzermenü",
   "Username": "Benutzername",
   "Version: {{version}}": "Version: {{version}}",
   "Video": "Video",
-  "Video call": "Videoanruf",
-  "Video call name": "Name des Videoanrufs",
-  "Waiting for network": "Warte auf Netzwerk",
   "Waiting for other participants…": "Warte auf weitere Teilnehmer …",
-  "Walkie-talkie call": "Walkie-Talkie-Anruf",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC wird in diesem Browser nicht unterstützt oder ist blockiert.",
   "Yes, join call": "Ja, Anruf beitreten",
-  "You can't talk at the same time": "Du kannst nicht gleichzeitig sprechen",
-  "Your recent calls": "Deine letzten Anrufe",
-  "{{count}} people connected|one": "{{count}} Person verbunden",
-  "{{count}} people connected|other": "{{count}} Personen verbunden",
-  "{{displayName}}, your call is now ended": "{{displayName}}, dein Anruf wurde beendet",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is presenting": "{{name}} präsentiert",
-  "{{name}} is talking…": "{{name}} spricht …",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} – Walkie-Talkie-Anruf",
-  "Fetching group call timed out.": "Zeitüberschreitung beim Abrufen des Gruppenanrufs.",
-  "Walkie-talkie call name": "Name des Walkie-Talkie-Anrufs",
   "Sending debug logs…": "Sende Debug-Protokolle …",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Anruf beitreten</0><1>Oder</1><2>Anruflink kopieren und später beitreten</2>",
-  "{{name}} (Connecting...)": "{{name}} (verbindet sich …)",
-  "Allow analytics": "Analysedaten senden",
-  "Advanced": "Erweitert",
   "Copy": "Kopieren",
   "Element Call Home": "Element Call-Startseite",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Dies wird anonymisierte Daten (wie z. B. die Dauer eines Anrufs und die Zahl der Teilnehmenden) dem Element Call-Team senden, um uns bei der Optimierung der Anwendung basierend auf dem Nutzungsverhalten zu helfen.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Ob Tastenkürzel mit nur einer Taste aktiviert sein sollen, z. B. „m“ um das Mikrofon stumm/aktiv zu schalten.",
-  "Single-key keyboard shortcuts": "Ein-Tasten-Tastenkürzel",
-  "{{name}} (Waiting for video...)": "{{name}} (Warte auf Video …)",
-  "This feature is only supported on Firefox.": "Diese Funktion wird nur in Firefox unterstützt.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Hoppla, etwas ist schiefgelaufen.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Hoppla, etwas ist schiefgelaufen.</0>",
+  "Expose developer settings in the settings window.": "Zeige die Entwicklereinstellungen im Einstellungsfenster.",
+  "Developer Settings": "Entwicklereinstellungen",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Mit der Teilnahme an der Beta akzeptierst du die Sammlung von anonymen Daten, die wir zur Verbesserung des Produkts verwenden. Weitere Informationen zu den von uns erhobenen Daten findest du in unserer <2>Datenschutzerklärung</2> und unseren <5>Cookie-Richtlinien</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Du kannst deine Zustimmung durch Abwählen dieses Kästchens zurückziehen. Falls du dich aktuell in einem Anruf befindest, wird diese Einstellung nach dem Ende des Anrufs wirksam.",
+  "Feedback": "Rückmeldung",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Falls du auf Probleme stößt oder einfach nur eine Rückmeldung geben möchtest, sende uns bitte eine kurze Beschreibung.",
+  "Your feedback": "Deine Rückmeldung",
+  "Thanks, we received your feedback!": "Danke, wir haben deine Rückmeldung erhalten!",
+  "Submitting…": "Sende …",
+  "Submit": "Absenden",
+  "{{count}} stars|other": "{{count}} Sterne",
+  "{{displayName}}, your call has ended.": "{{displayName}}, dein Anruf wurde beendet.",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Wir würden uns freuen, deine Rückmeldung zu hören, um deine Erfahrung verbessern zu können.</0>",
+  "How did it go?": "Wie ist es gelaufen?",
+  "{{count}} stars|one": "{{count}} Stern",
+  "<0>Thanks for your feedback!</0>": "<0>Danke für deine Rückmeldung!</0>",
+  "{{displayName}} is presenting": "{{displayName}} präsentiert",
+  "Show connection stats": "Verbindungsstatistiken zeigen",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Mit einem Klick auf „Anruf beitreten“ akzeptierst du unseren <2>Endbenutzer-Lizenzvertrag (EULA)</2>",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Mit einem Klick auf „Los geht’s“ akzeptierst du unseren <2>Endbenutzer-Lizenzvertrag (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Diese Seite wird durch reCAPTCHA geschützt und es gelten Googles <2>Datenschutzerklärung</2> und <6>Nutzungsbedingungen</6>. <9></9>Mit einem Klick auf „Registrieren“ akzeptierst du unseren <2>Endbenutzer-Lizenzvertrag (EULA)</2>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call ist temporär nicht Ende-zu-Ende-verschlüsselt, während wir die Skalierbarkeit testen.",
+  "Connectivity to the server has been lost.": "Die Verbindung zum Server wurde getrennt.",
+  "Enable end-to-end encryption (password protected calls)": "Ende-zu-Ende-Verschlüsselung aktivieren (Passwortgeschützte Anrufe)",
+  "End-to-end encryption isn't supported on your browser.": "Ende-zu-Ende-Verschlüsselung wird in deinem Browser nicht unterstützt.",
+  "Thanks!": "Danke!",
+  "You were disconnected from the call": "Deine Verbindung wurde getrennt",
+  "Reconnect": "Erneut verbinden",
+  "Retry sending logs": "Protokolle erneut senden",
+  "Encrypted": "Verschlüsselt",
+  "End call": "Anruf beenden",
+  "Grid": "Raster",
+  "Not encrypted": "Nicht verschlüsselt",
+  "Microphone off": "Mikrofon aus",
+  "Microphone on": "Mikrofon an",
+  "{{count, number}}|one": "{{count, number}}",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "Share": "Teilen",
+  "Share this call": "Diesen Anruf teilen",
+  "Sharing screen": "Bildschirm wird geteilt",
+  "You": "Du",
+  "Continue in browser": "Weiter im Browser",
+  "Name of call": "Name des Anrufs",
+  "Open in the app": "In der App öffnen",
+  "Ready to join?": "Bereit, beizutreten?",
+  "Unmute microphone": "Mikrofon aktivieren",
+  "Start video": "Video aktivieren",
+  "Stop video": "Video deaktivieren",
+  "Back to recents": "Zurück zu kürzlichen Anrufen",
+  "Select app": "App auswählen",
+  "Mute microphone": "Mikrofon deaktivieren",
+  "Start new call": "Neuen Anruf beginnen",
+  "Call not found": "Anruf nicht gefunden",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Anrufe sind nun Ende-zu-Ende-verschlüsselt und müssen auf der Startseite erstellt werden. Damit stellen wir sicher, dass alle denselben Schlüssel verwenden.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Dein Webbrowser unterstützt keine Medien-Ende-zu-Ende-Verschlüsselung. Unterstützte Browser sind Chrome, Safari, Firefox >=117"
 }

public/locales/el/app.json

@@ -0,0 +1,88 @@
+{
+  "Version: {{version}}": "Έκδοση: {{version}}",
+  "User menu": "Μενού χρήστη",
+  "Submit feedback": "Υποβάλετε σχόλια",
+  "Sign in": "Σύνδεση",
+  "Show call inspector": "Εμφάνιση του επιθεωρητή κλήσης",
+  "Share screen": "Κοινή χρήση οθόνης",
+  "Sending…": "Αποστολή…",
+  "Select an option": "Επιλέξτε μια επιλογή",
+  "Remove": "Αφαίρεση",
+  "Registering…": "Εγγραφή…",
+  "Not registered yet? <2>Create an account</2>": "Δεν έχετε εγγραφεί ακόμα; <2>Δημιουργήστε λογαριασμό</2>",
+  "Login to your account": "Συνδεθείτε στον λογαριασμό σας",
+  "Logging in…": "Σύνδεση…",
+  "Inspector": "Επιθεωρητής",
+  "Display name": "Εμφανιζόμενο όνομα",
+  "Developer Settings": "Ρυθμίσεις προγραμματιστή",
+  "Debug log request": "Αίτημα αρχείου καταγραφής",
+  "Avatar": "Avatar",
+  "<0>Oops, something's gone wrong.</0>": "<0>Ωχ, κάτι πήγε στραβά.</0>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Δημιουργήστε λογαριασμό</0> Ή <2>Συμμετέχετε ως επισκέπτης</2>",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Έχετε ήδη λογαριασμό;</0><1><0>Συνδεθείτε</0> Ή <2>Συμμετέχετε ως επισκέπτης</2></1>",
+  "Yes, join call": "Ναι, συμμετοχή στην κλήση",
+  "Waiting for other participants…": "Αναμονή για άλλους συμμετέχοντες…",
+  "Video": "Βίντεο",
+  "Username": "Όνομα χρήστη",
+  "This call already exists, would you like to join?": "Αυτή η κλήση υπάρχει ήδη, θα θέλατε να συμμετάσχετε;",
+  "Speaker": "Ηχείο",
+  "Sign out": "Αποσύνδεση",
+  "Settings": "Ρυθμίσεις",
+  "Return to home screen": "Επιστροφή στην αρχική οθόνη",
+  "Register": "Εγγραφή",
+  "Profile": "Προφίλ",
+  "Passwords must match": "Οι κωδικοί πρέπει να ταιριάζουν",
+  "Password": "Κωδικός",
+  "Not now, return to home screen": "Όχι τώρα, επιστροφή στην αρχική οθόνη",
+  "No": "Όχι",
+  "More": "Περισσότερα",
+  "Microphone": "Μικρόφωνο",
+  "Login": "Σύνδεση",
+  "Loading…": "Φόρτωση…",
+  "Join existing call?": "Συμμετοχή στην υπάρχουσα κλήση;",
+  "Join call now": "Συμμετοχή στην κλήση τώρα",
+  "Join call": "Συμμετοχή στην κλήση",
+  "Go": "Μετάβαση",
+  "Full screen": "Πλήρη οθόνη",
+  "Exit full screen": "Έξοδος από πλήρη οθόνη",
+  "Create account": "Δημιουργία λογαριασμού",
+  "Copy and share this call link": "Αντιγράψτε και μοιραστείτε αυτόν τον σύνδεσμο κλήσης",
+  "Copy": "Αντιγραφή",
+  "Copied!": "Αντιγράφηκε!",
+  "Confirm password": "Επιβεβαίωση κωδικού",
+  "Close": "Κλείσιμο",
+  "Camera": "Κάμερα",
+  "Audio": "Ήχος",
+  "Send debug logs": "Αποστολή αρχείων καταγραφής",
+  "Recaptcha dismissed": "Το recaptcha απορρίφθηκε",
+  "<0>Thanks for your feedback!</0>": "<0>Ευχαριστώ για τα σχόλιά σας!</0>",
+  "Local volume": "Τοπική ένταση",
+  "Home": "Αρχική",
+  "Show connection stats": "Εμφάνιση στατιστικών σύνδεσης",
+  "{{displayName}} is presenting": "{{displayName}} παρουσιάζει",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Μπορείτε να ανακαλέσετε τη συγκατάθεσή σας αποεπιλέγοντας αυτό το πλαίσιο. Εάν βρίσκεστε σε κλήση, η ρύθμιση αυτή θα τεθεί σε ισχύ στο τέλος της.",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Θα θέλαμε να ακούσουμε τα σχόλιά σας ώστε να βελτιώσουμε την εμπειρία σας.</0>",
+  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Γιατί να μην ολοκληρώσετε με τη δημιουργία ενός κωδικού πρόσβασης για τη διατήρηση του λογαριασμού σας;</0><1>Θα μπορείτε να διατηρήσετε το όνομά σας και να ορίσετε ένα avatar για χρήση σε μελλοντικές κλήσεις.</1>",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ένας άλλος χρήστης σε αυτή την κλήση έχει ένα πρόβλημα. Για την καλύτερη διάγνωση αυτών των προβλημάτων θα θέλαμε να συλλέξουμε ένα αρχείο καταγραφής σφαλμάτων.",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Συμμετέχοντας σε αυτή τη δοκιμαστική έκδοση, συναινείτε στη συλλογή ανώνυμων δεδομένων, τα οποία χρησιμοποιούμε για τη βελτίωση του προϊόντος. Μπορείτε να βρείτε περισσότερες πληροφορίες σχετικά με το ποια δεδομένα καταγράφουμε στην <2>Πολιτική απορρήτου</2> και στην <5>Πολιτική cookies</5>.",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Εάν αντιμετωπίζετε προβλήματα ή απλά θέλετε να μας δώσετε κάποια σχόλια, παρακαλούμε στείλτε μας μια σύντομη περιγραφή παρακάτω.",
+  "Expose developer settings in the settings window.": "Εμφάνιση ρυθμίσεων προγραμματιστή στο παράθυρο ρυθμίσεων.",
+  "Feedback": "Ανατροφοδότηση",
+  "Submitting…": "Υποβολή…",
+  "Thanks, we received your feedback!": "Ευχαριστούμε, λάβαμε τα σχόλιά σας!",
+  "{{count}} stars|other": "{{count}} αστέρια",
+  "{{count}} stars|one": "{{count}} αστέρι",
+  "{{displayName}}, your call has ended.": "{{displayName}}, η κλήση σας τερματίστηκε.",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Η υποβολή αρχείων καταγραφής σφαλμάτων θα μας βοηθήσει να εντοπίσουμε το πρόβλημα.</0>",
+  "How did it go?": "Πώς σας φάνηκε;",
+  "Include debug logs": "Να συμπεριληφθούν αρχεία καταγραφής",
+  "Recaptcha not loaded": "Το Recaptcha δεν φορτώθηκε",
+  "Debug log": "Αρχείο καταγραφής",
+  "Developer": "Προγραμματιστής",
+  "Download debug logs": "Λήψη αρχείων καταγραφής",
+  "Sending debug logs…": "Αποστολή αρχείων καταγραφής…",
+  "Submit": "Υποβολή",
+  "Your feedback": "Τα σχόλιά σας",
+  "Spotlight": "Spotlight",
+  "Element Call Home": "Element Κεντρική Οθόνη Κλήσεων"
+}

public/locales/en-GB/app.json

@@ -1,145 +1,126 @@
 {
-  "{{count}} people connected|one": "{{count}} person connected",
+  "{{count, number}}|one": "{{count, number}}",
-  "{{count}} people connected|other": "{{count}} people connected",
+  "{{count, number}}|other": "{{count, number}}",
-  "{{displayName}}, your call is now ended": "{{displayName}}, your call is now ended",
+  "{{count}} stars|one": "{{count}} stars",
-  "{{name}} (Connecting...)": "{{name}} (Connecting...)",
+  "{{count}} stars|other": "{{count}} stars",
-  "{{name}} (Waiting for video...)": "{{name}} (Waiting for video...)",
+  "{{displayName}} is presenting": "{{displayName}} is presenting",
-  "{{name}} is presenting": "{{name}} is presenting",
+  "{{displayName}}, your call has ended.": "{{displayName}}, your call has ended.",
-  "{{name}} is talking…": "{{name}} is talking…",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Walkie-talkie call",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Create an account</0> Or <2>Access as a guest</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>",
   "<0>Oops, something's gone wrong.</0>": "<0>Oops, something's gone wrong.</0>",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Submitting debug logs will help us track down the problem.</0>",
+  "<0>Thanks for your feedback!</0>": "<0>Thanks for your feedback!</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>We'd love to hear your feedback so we can improve your experience.</0>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>",
-  "Accept camera/microphone permissions to join the call.": "Accept camera/microphone permissions to join the call.",
-  "Accept microphone permissions to join the call.": "Accept microphone permissions to join the call.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "By clicking \"Go\", you agree to our <2>Terms and conditions</2>",
+  "Back to recents": "Back to recents",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
-  "By ticking this box you consent to the collection of anonymous data, which we use to improve your experience. You can find more information about which data we track in our ": "By ticking this box you consent to the collection of anonymous data, which we use to improve your experience. You can find more information about which data we track in our ",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
-  "Call link copied": "Call link copied",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.",
-  "Call type menu": "Call type menu",
+  "Call not found": "Call not found",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.",
   "Camera": "Camera",
-  "Camera {{n}}": "Camera {{n}}",
-  "Camera/microphone permissions needed to join the call.": "Camera/microphone permissions needed to join the call.",
-  "Change layout": "Change layout",
   "Close": "Close",
   "Confirm password": "Confirm password",
-  "Connection lost": "Connection lost",
+  "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
+  "Continue in browser": "Continue in browser",
   "Copied!": "Copied!",
   "Copy": "Copy",
   "Copy and share this call link": "Copy and share this call link",
   "Create account": "Create account",
   "Debug log": "Debug log",
   "Debug log request": "Debug log request",
-  "Description (optional)": "Description (optional)",
-  "Details": "Details",
   "Developer": "Developer",
   "Developer Settings": "Developer Settings",
   "Display name": "Display name",
   "Download debug logs": "Download debug logs",
   "Element Call Home": "Element Call Home",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call is temporarily not end-to-end encrypted while we test scalability.",
+  "Enable end-to-end encryption (password protected calls)": "Enable end-to-end encryption (password protected calls)",
+  "Encrypted": "Encrypted",
+  "End call": "End call",
+  "End-to-end encryption isn't supported on your browser.": "End-to-end encryption isn't supported on your browser.",
   "Exit full screen": "Exit full screen",
   "Expose developer settings in the settings window.": "Expose developer settings in the settings window.",
-  "Fetching group call timed out.": "Fetching group call timed out.",
+  "Feedback": "Feedback",
-  "Freedom": "Freedom",
   "Full screen": "Full screen",
   "Go": "Go",
-  "Grid layout menu": "Grid layout menu",
+  "Grid": "Grid",
-  "Having trouble? Help us fix it.": "Having trouble? Help us fix it.",
   "Home": "Home",
+  "How did it go?": "How did it go?",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.",
   "Include debug logs": "Include debug logs",
-  "Incompatible versions": "Incompatible versions",
-  "Incompatible versions!": "Incompatible versions!",
   "Inspector": "Inspector",
-  "Invite": "Invite",
-  "Invite people": "Invite people",
   "Join call": "Join call",
   "Join call now": "Join call now",
   "Join existing call?": "Join existing call?",
-  "Leave": "Leave",
-  "Loading room…": "Loading room…",
   "Loading…": "Loading…",
   "Local volume": "Local volume",
   "Logging in…": "Logging in…",
   "Login": "Login",
   "Login to your account": "Login to your account",
   "Microphone": "Microphone",
-  "Microphone {{n}}": "Microphone {{n}}",
+  "Microphone off": "Microphone off",
-  "Microphone permissions needed to join the call.": "Microphone permissions needed to join the call.",
+  "Microphone on": "Microphone on",
   "More": "More",
-  "More menu": "More menu",
   "Mute microphone": "Mute microphone",
+  "Name of call": "Name of call",
   "No": "No",
+  "Not encrypted": "Not encrypted",
   "Not now, return to home screen": "Not now, return to home screen",
   "Not registered yet? <2>Create an account</2>": "Not registered yet? <2>Create an account</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>",
+  "Open in the app": "Open in the app",
   "Password": "Password",
   "Passwords must match": "Passwords must match",
-  "Press and hold spacebar to talk": "Press and hold spacebar to talk",
-  "Press and hold spacebar to talk over {{name}}": "Press and hold spacebar to talk over {{name}}",
-  "Press and hold to talk": "Press and hold to talk",
-  "Press and hold to talk over {{name}}": "Press and hold to talk over {{name}}",
-  "Privacy Policy": "Privacy Policy",
   "Profile": "Profile",
+  "Ready to join?": "Ready to join?",
   "Recaptcha dismissed": "Recaptcha dismissed",
   "Recaptcha not loaded": "Recaptcha not loaded",
+  "Reconnect": "Reconnect",
   "Register": "Register",
   "Registering…": "Registering…",
-  "Release spacebar key to stop": "Release spacebar key to stop",
-  "Release to stop": "Release to stop",
   "Remove": "Remove",
+  "Retry sending logs": "Retry sending logs",
   "Return to home screen": "Return to home screen",
-  "Save": "Save",
-  "Saving…": "Saving…",
   "Select an option": "Select an option",
+  "Select app": "Select app",
   "Send debug logs": "Send debug logs",
   "Sending debug logs…": "Sending debug logs…",
   "Sending…": "Sending…",
   "Settings": "Settings",
+  "Share": "Share",
   "Share screen": "Share screen",
+  "Share this call": "Share this call",
+  "Sharing screen": "Sharing screen",
   "Show call inspector": "Show call inspector",
+  "Show connection stats": "Show connection stats",
   "Sign in": "Sign in",
   "Sign out": "Sign out",
-  "Single-key keyboard shortcuts": "Single-key keyboard shortcuts",
-  "Spatial audio": "Spatial audio",
   "Speaker": "Speaker",
-  "Speaker {{n}}": "Speaker {{n}}",
   "Spotlight": "Spotlight",
-  "Stop sharing screen": "Stop sharing screen",
+  "Start new call": "Start new call",
+  "Start video": "Start video",
+  "Stop video": "Stop video",
+  "Submit": "Submit",
   "Submit feedback": "Submit feedback",
-  "Submitting feedback…": "Submitting feedback…",
+  "Submitting…": "Submitting…",
-  "Take me Home": "Take me Home",
+  "Thanks, we received your feedback!": "Thanks, we received your feedback!",
-  "Talk over speaker": "Talk over speaker",
+  "Thanks!": "Thanks!",
-  "Talking…": "Talking…",
-  "Thanks! We'll get right on it.": "Thanks! We'll get right on it.",
   "This call already exists, would you like to join?": "This call already exists, would you like to join?",
-  "This feature is only supported on Firefox.": "This feature is only supported on Firefox.",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)",
-  "Turn off camera": "Turn off camera",
-  "Turn on camera": "Turn on camera",
   "Unmute microphone": "Unmute microphone",
-  "Use the upcoming grid system": "Use the upcoming grid system",
-  "User ID": "User ID",
   "User menu": "User menu",
   "Username": "Username",
   "Version: {{version}}": "Version: {{version}}",
   "Video": "Video",
-  "Video call": "Video call",
-  "Video call name": "Video call name",
-  "Waiting for network": "Waiting for network",
   "Waiting for other participants…": "Waiting for other participants…",
-  "Walkie-talkie call": "Walkie-talkie call",
-  "Walkie-talkie call name": "Walkie-talkie call name",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC is not supported or is being blocked in this browser.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.",
   "Yes, join call": "Yes, join call",
-  "You can't talk at the same time": "You can't talk at the same time",
+  "You": "You",
-  "Your recent calls": "Your recent calls"
+  "You were disconnected from the call": "You were disconnected from the call",
+  "Your feedback": "Your feedback",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117"
 }

public/locales/es/app.json

@@ -1,45 +1,18 @@
 {
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>¿Por qué no mantienes tu cuenta estableciendo una contraseña?</0><1>Podrás mantener tu nombre y establecer un avatar para usarlo en futuras llamadas</1>",
-  "Press and hold to talk over {{name}}": "Mantén pulsado para hablar por encima de {{name}}",
-  "Your recent calls": "Tus llamadas recientes",
-  "WebRTC is not supported or is being blocked in this browser.": "Tu navegador no soporta o está bloqueando WebRTC.",
   "This call already exists, would you like to join?": "Esta llamada ya existe, ¿te gustaría unirte?",
   "Register": "Registrarse",
   "Not registered yet? <2>Create an account</2>": "¿No estás registrado todavía? <2>Crear una cuenta</2>",
   "Login to your account": "Iniciar sesión en tu cuenta",
-  "Camera/microphone permissions needed to join the call.": "Se necesitan los permisos de cámara/micrófono para unirse a la llamada.",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Al hacer clic en \"Unirse a la llamada ahora\", aceptarás nuestros <2>Términos y condiciones</2>",
-  "Accept microphone permissions to join the call.": "Acepta el permiso del micrófono para unirte a la llamada.",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Al hacer clic en \"Comenzar\" aceptarás nuestros <2>Términos y condiciones</2>",
-  "You can't talk at the same time": "No podéis hablar a la vez",
   "Yes, join call": "Si, unirse a la llamada",
-  "Walkie-talkie call name": "Nombre de la llamada Walkie-talkie",
-  "Walkie-talkie call": "Llamada Walkie-talkie",
   "Waiting for other participants…": "Esperando a los otros participantes…",
-  "Waiting for network": "Esperando a la red",
-  "Video call name": "Nombre de la videollamada",
-  "Video call": "Videollamada",
   "Video": "Video",
   "Version: {{version}}": "Versión: {{version}}",
   "Username": "Nombre de usuario",
   "User menu": "Menú de usuario",
-  "User ID": "ID de usuario",
-  "Unmute microphone": "Desilenciar el micrófono",
-  "Turn on camera": "Encender la cámara",
-  "Turn off camera": "Apagar la cámara",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Esto hará que el audio de la persona que hable parezca que viene de dondé esté posicionado en la pantalla. (Función experimental: esto puede afectar a la estabilidad del audio.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Este sitio está protegido por ReCAPTCHA y se aplica <2>la Política de Privacidad</2> y <6>los Términos de Servicio</6> de Google.<9></9>Al hacer clic en \"Registrar\" aceptarás nuestros <12>Términos y condiciones</12>",
-  "Thanks! We'll get right on it.": "¡Gracias! Nos encargaremos de ello.",
-  "Talking…": "Hablando…",
-  "Talk over speaker": "Hablar por encima",
-  "Take me Home": "Volver al inicio",
-  "Submitting feedback…": "Enviando comentarios…",
   "Submit feedback": "Enviar comentarios",
-  "Stop sharing screen": "Dejar de compartir pantalla",
   "Spotlight": "Foco",
-  "Speaker {{n}}": "Altavoz {{n}}",
   "Speaker": "Altavoz",
-  "Spatial audio": "Audio espacial",
   "Sign out": "Cerrar sesión",
   "Sign in": "Iniciar sesión",
   "Show call inspector": "Mostrar inspector de llamada",
@@ -49,95 +22,71 @@
   "Sending debug logs…": "Enviando registros de depuración…",
   "Send debug logs": "Enviar registros de depuración",
   "Select an option": "Selecciona una opción",
-  "Saving…": "Guardando…",
-  "Save": "Guardar",
   "Return to home screen": "Volver a la pantalla de inicio",
   "Remove": "Eliminar",
-  "Release to stop": "Suelta para parar",
-  "Release spacebar key to stop": "Suelta la barra espaciadora para parar",
   "Registering…": "Registrando…",
   "Recaptcha not loaded": "No se ha cargado el Recaptcha",
   "Recaptcha dismissed": "Recaptcha cancelado",
   "Profile": "Perfil",
-  "Press and hold to talk": "Mantén pulsado para hablar",
-  "Press and hold spacebar to talk over {{name}}": "Mantén pulsada la barra espaciadora para hablar por encima de {{name}}",
-  "Press and hold spacebar to talk": "Mantén pulsada la barra espaciadora para hablar",
   "Passwords must match": "Las contraseñas deben coincidir",
   "Password": "Contraseña",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Otros usuarios están intentando unirse a la llamada con versiones incompatibles. Estos usuarios deberán asegurarse de que han refrescado sus navegadores:<1>{userLis}</1>",
   "Not now, return to home screen": "Ahora no, volver a la pantalla de inicio",
   "No": "No",
-  "Mute microphone": "Silenciar micrófono",
-  "More menu": "Menú Más",
   "More": "Más",
-  "Microphone permissions needed to join the call.": "Se necesitan permisos del micrófono para unirse a la llamada.",
-  "Microphone {{n}}": "Micrófono {{n}}",
   "Microphone": "Micrófono",
   "Login": "Iniciar sesión",
   "Logging in…": "Iniciando sesión…",
   "Local volume": "Volumen local",
   "Loading…": "Cargando…",
-  "Loading room…": "Cargando sala…",
-  "Leave": "Abandonar",
   "Join existing call?": "¿Unirse a llamada existente?",
   "Join call now": "Unirse a la llamada ahora",
   "Join call": "Unirse a la llamada",
-  "Invite people": "Invitar a gente",
-  "Invite": "Invitar",
   "Inspector": "Inspector",
-  "Incompatible versions!": "¡Versiones incompatibles!",
-  "Incompatible versions": "Versiones incompatibles",
   "Include debug logs": "Incluir registros de depuración",
   "Home": "Inicio",
-  "Having trouble? Help us fix it.": "¿Tienes problemas? Ayúdanos a resolverlos.",
-  "Grid layout menu": "Menú de distribución de cuadrícula",
   "Go": "Comenzar",
   "Full screen": "Pantalla completa",
-  "Freedom": "Libre",
-  "Fetching group call timed out.": "Se ha agotado el tiempo de espera para obtener la llamada grupal.",
   "Exit full screen": "Salir de pantalla completa",
   "Download debug logs": "Descargar registros de depuración",
   "Display name": "Nombre a mostrar",
   "Developer": "Desarrollador",
-  "Details": "Detalles",
-  "Description (optional)": "Descripción (opcional)",
   "Debug log request": "Petición de registros de depuración",
   "Debug log": "Registro de depuración",
   "Create account": "Crear cuenta",
   "Copy and share this call link": "Copiar y compartir el enlace de la llamada",
   "Copied!": "¡Copiado!",
-  "Connection lost": "Conexión perdida",
   "Confirm password": "Confirmar contraseña",
   "Close": "Cerrar",
-  "Change layout": "Cambiar distribución",
-  "Camera {{n}}": "Cámara {{n}}",
   "Camera": "Cámara",
-  "Call type menu": "Menú de tipo de llamada",
-  "Call link copied": "Enlace de la llamada copiado",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Otro usuario en esta llamada está teniendo problemas. Para diagnosticar estos problemas nos gustaría recopilar un registro de depuración.",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "Accept camera/microphone permissions to join the call.": "Acepta los permisos de cámara/micrófono para unirte a la llamada.",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Crear una cuenta</0> o <2>Acceder como invitado</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Unirse ahora</0><1>Or</1><2>Copiar el enlace y unirse más tarde</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>¿Ya tienes una cuenta?</0><1><0>Iniciar sesión</0> o <2>Acceder como invitado</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Llamada de Walkie-talkie",
-  "{{name}} is talking…": "{{name}} está hablando…",
-  "{{name}} is presenting": "{{name}} está presentando",
-  "{{name}} (Connecting...)": "{{name}} (Conectando...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}, tu llamada ha finalizado",
-  "{{count}} people connected|other": "{{count}} personas conectadas",
-  "{{count}} people connected|one": "{{count}} persona conectada",
-  "Allow analytics": "Permitir analíticas",
-  "Advanced": "Avanzado",
   "Element Call Home": "Inicio de Element Call",
   "Copy": "Copiar",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Esto enviará datos anónimos (como la duración de la llamada y el número de participantes) al equipo de Element Call para ayudarnos a optimizar la aplicación dependiendo de cómo se use.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Habilita los atajos de teclado de una sola tecla, por ejemplo 'm' para silenciar/desilenciar el micrófono.",
-  "Single-key keyboard shortcuts": "Atajos de teclado de una sola tecla",
-  "{{name}} (Waiting for video...)": "{{name}} (Esperando al video...)",
-  "This feature is only supported on Firefox.": "Esta característica solo está disponible en Firefox.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Subir los registros de depuración nos ayudará a encontrar el problema.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ups, algo ha salido mal.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Ups, algo ha salido mal.</0>",
+  "Expose developer settings in the settings window.": "Muestra los ajustes de desarrollador en la ventana de ajustes.",
+  "Developer Settings": "Ajustes de desarrollador",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Al participar en esta beta, consientes a la recogida de datos anónimos, los cuales usaremos para mejorar el producto. Puedes encontrar más información sobre que datos recogemos en nuestra <2>Política de privacidad</2> y en nuestra <5>Política sobre Cookies</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Puedes retirar tu consentimiento desmarcando esta casilla. Si estás en una llamada, este ajuste se aplicará al final de esta.",
+  "{{displayName}} is presenting": "{{displayName}} está presentando",
+  "<0>Thanks for your feedback!</0>": "<0>¡Gracias por tus comentarios!</0>",
+  "How did it go?": "¿Cómo ha ido?",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Este sitio está protegido por ReCAPTCHA y se aplican la <2>Política de Privacidad</2> y los <6>Términos de Servicio de Google.<9></9>Al hacer clic en \"Registrar\", aceptas nuestro <12>Contrato de Licencia de Usuario Final (CLUF)</12>",
+  "Show connection stats": "Mostrar estadísticas de conexión",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call no está encriptado de extremo a extremo de manera temporal mientras probamos la escalabilidad del servicio.",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Al hacer clic en \"Comenzar\", aceptas nuestro <2>Contrato de Licencia de Usuario Final (CLUF)</2>",
+  "Thanks, we received your feedback!": "¡Gracias, hemos recibido tus comentarios!",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Si tienes algún problema o simplemente quieres darnos tu opinión, por favor envíanos una breve descripción.",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Al hacer clic en \"Unirse a la llamada ahora\", aceptas nuestro <2>Contrato de Licencia de Usuario Final (CLUF)</2>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Nos encantaría conocer tu opinión para que podamos mejorar tu experiencia</0>",
+  "Feedback": "Danos tu opinión",
+  "Submit": "Enviar",
+  "{{count}} stars|one": "{{count}} estrella",
+  "{{count}} stars|other": "{{count}} estrellas",
+  "{{displayName}}, your call has ended.": "{{displayName}}, tu llamada ha finalizado.",
+  "Submitting…": "Enviando…",
+  "Your feedback": "Tus comentarios"
 }

public/locales/et/app.json

@@ -1,91 +1,45 @@
 {
-  "Accept camera/microphone permissions to join the call.": "Kõnega liitumiseks anna õigused kaamera/mikrofoni kasutamiseks.",
-  "Accept microphone permissions to join the call.": "Kõnega liitumiseks anna õigused mikrofoni kasutamiseks.",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Kas soovid salasõna seadistada ja sellega oma kasutajakonto alles jätta?</0><1>Nii saad säilitada oma nime ja määrata profiilipildi, mida saad kasutada tulevastes kõnedes</1>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Liitu kõnega kohe</0><1> Või</1><2>Kopeeri kõne link ja liitu hiljem</2>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Loo konto</0> Või <2>Sisene külalisena</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>On sul juba konto?</0><1><0>Logi sisse</0> Või <2>Logi sisse külalisena</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - walkie-talkie-kõne",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{nimi}} räägib…",
-  "{{name}} is presenting": "{{nimi}} esitab",
-  "{{name}} (Connecting...)": "{{nimi}} (ühendamisel...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}, sinu kõne on nüüd lõppenud",
-  "{{count}} people connected|other": "{{count}} osalejat liitunud",
-  "{{count}} people connected|one": "{{count}} osaleja liitunud",
-  "Invite people": "Kutsu inimesi",
-  "Invite": "Kutsu",
   "Inspector": "Inspektor",
-  "Incompatible versions!": "Ühildumatud versioonid!",
-  "Incompatible versions": "Ühildumatud versioonid",
   "Include debug logs": "Lisa veatuvastuslogid",
   "Home": "Avavaatesse",
-  "Having trouble? Help us fix it.": "Kas on probleeme? Aita meil asja parandada.",
-  "Grid layout menu": "Ruudustikvaate menüü",
   "Go": "Jätka",
   "Full screen": "Täisekraan",
-  "Freedom": "Vaba",
-  "Fetching group call timed out.": "Grupikõne kättesaamine aegus.",
   "Exit full screen": "Välju täisekraanivaatest",
   "Download debug logs": "Lae alla veatuvastuslogid",
   "Display name": "Kuvatav nimi",
   "Developer": "Arendaja",
-  "Details": "Täpsemalt",
-  "Description (optional)": "Kirjeldus (valikuline)",
   "Debug log request": "Veaotsingulogi päring",
   "Debug log": "Veaotsingulogi",
   "Create account": "Loo konto",
   "Copy and share this call link": "Kopeeri ja jaga selle kõne linki",
   "Copied!": "Kopeeritud!",
-  "Connection lost": "Ühendus on katkenud",
   "Confirm password": "Kinnita salasõna",
   "Close": "Sulge",
-  "Change layout": "Muuda paigutust",
-  "Camera/microphone permissions needed to join the call.": "Kõnega liitumiseks vajalikud kaamera/mikrofoni kasutamise load.",
-  "Camera {{n}}": "Kaamera {{n}}",
   "Camera": "Kaamera",
-  "Call type menu": "Kõnetüübi valik",
-  "Call link copied": "Kõne link on kopeeritud",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Klõpsides „Liitu kõnega“nõustud sa meie <2>kasutustingimustega</2>",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Klõpsides „Jätka“nõustud sa meie <2>kasutustingimustega</2>",
   "Avatar": "Tunnuspilt",
   "Audio": "Heli",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ühel teisel selles kõnes osalejal on lahenduse kasutamisel tekkinud probleem ning selle põhjuse leidmiseks me sooviksime koguda silumislogisid.",
-  "Press and hold spacebar to talk": "Rääkimiseks vajuta ja hoia all tühikuklahvi",
   "Passwords must match": "Salasõnad ei klapi",
   "Password": "Salasõna",
-  "Not registered yet? <2>Create an account</2>": "Pole veel registreerunud? <2>Loo kasutajakonto</2>",
+  "Not registered yet? <2>Create an account</2>": "Sa pole veel registreerunud? <2>Loo kasutajakonto</2>",
   "Not now, return to home screen": "Mitte praegu, mine tagasi avalehele",
   "No": "Ei",
-  "Mute microphone": "Summuta mikrofon",
-  "Your recent calls": "Hiljutised kõned",
-  "You can't talk at the same time": "Üheaegselt ei saa rääkida",
-  "More menu": "Rohkem valikuid",
   "More": "Rohkem",
-  "Microphone permissions needed to join the call.": "Kõnega liitumiseks on vaja lubada mikrofoni kasutamine.",
-  "Microphone {{n}}": "Mikrofon {{n}}",
   "Microphone": "Mikrofon",
   "Login to your account": "Logi oma kontosse sisse",
   "Login": "Sisselogimine",
   "Logging in…": "Sisselogimine …",
   "Local volume": "Kohalik helitugevus",
   "Loading…": "Laadimine …",
-  "Loading room…": "Ruumi laadimine …",
-  "Leave": "Lahku",
   "Join existing call?": "Liitu juba käimasoleva kõnega?",
-  "Join call now": "Kõnega liitumine",
+  "Join call now": "Liitu kõnega kohe",
   "Join call": "Kõnega liitumine",
-  "User ID": "Kasutajatunnus",
-  "Turn on camera": "Lülita kaamera sisse",
-  "Turn off camera": "Lülita kaamera välja",
-  "Submitting feedback…": "Tagasiside saatmine…",
-  "Take me Home": "Mine avalehele",
   "Submit feedback": "Jaga tagasisidet",
-  "Stop sharing screen": "Lõpeta ekraani jagamine",
   "Spotlight": "Rambivalgus",
-  "Speaker {{n}}": "Kõlar {{n}}",
   "Speaker": "Kõlar",
-  "Spatial audio": "Ruumiline heli",
   "Sign out": "Logi välja",
   "Sign in": "Logi sisse",
   "Show call inspector": "Näita kõneteavet",
@@ -95,49 +49,78 @@
   "Sending debug logs…": "Veaotsingulogide saatmine…",
   "Send debug logs": "Saada veaotsingulogid",
   "Select an option": "Vali oma eelistus",
-  "Saving…": "Salvestamine…",
-  "Save": "Salvesta",
   "Return to home screen": "Tagasi avalehele",
   "Remove": "Eemalda",
-  "Release to stop": "Peatamiseks vabasta klahv",
-  "Release spacebar key to stop": "Peatamiseks vabasta tühikuklahv",
   "Registering…": "Registreerimine…",
   "Register": "Registreeru",
   "Recaptcha not loaded": "Robotilõks pole laetud",
   "Recaptcha dismissed": "Robotilõks on vahele jäetud",
   "Profile": "Profiil",
-  "Press and hold to talk over {{name}}": "{{name}} ülerääkimiseks vajuta ja hoia all",
-  "Press and hold to talk": "Rääkimiseks vajuta ja hoia all",
-  "Press and hold spacebar to talk over {{name}}": "{{name}} ülerääkimiseks vajuta ja hoia all tühikuklahvi",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Teised kasutajad üritavad selle kõnega liituda ühildumatuid versioone kasutades. Need kasutajad peaksid oma brauseris lehe uuestilaadimise tegema:<1>{userLis}</1>",
   "Waiting for other participants…": "Ootame teiste osalejate lisandumist…",
-  "Waiting for network": "Ootame võrguühendust",
-  "Video call name": "Videokõne nimi",
-  "Video call": "Videokõne",
   "Video": "Video",
   "Version: {{version}}": "Versioon: {{version}}",
   "Username": "Kasutajanimi",
   "This call already exists, would you like to join?": "See kõne on juba olemas, kas soovid liituda?",
-  "Talking…": "Jutt käib…",
-  "Talk over speaker": "Räägi teisest kõnelejast üle",
-  "Thanks! We'll get right on it.": "Tänud! Tegeleme sellega esimesel võimalusel.",
-  "Unmute microphone": "Aktiveeri mikrofon",
   "User menu": "Kasutajamenüü",
   "Yes, join call": "Jah, liitu kõnega",
-  "Walkie-talkie call": "Walkie-talkie stiilis kõne",
-  "Walkie-talkie call name": "Walkie-talkie stiilis kõne nimi",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC pole kas selles brauseris toetatud või on keelatud.",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Muudab kõneleja heli nii, nagu tuleks see sealt, kus on tema pilt ekraanil. (See on katseline funktsionaalsus ja võib mõjutada heli stabiilsust.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Siin saidis on kasutusel ReCAPTCHA ning kehtivad Google <2>privaatsuspoliitika</2> ja <6>teenusetingimused</6>.<9></9>Klikkides „Registreeru“, nõustud meie <12>kasutustingimustega</12>",
-  "Allow analytics": "Luba analüütika",
-  "Advanced": "Lisaseadistused",
   "Element Call Home": "Element Call Home",
   "Copy": "Kopeeri",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Me saadame kõne anonüümsed andmed (nagu kõne kestus ja osalejate arv) meie arendustiimile ja see võimaldab levinud kasutusmustrite alusel arendust optimeerida.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Kas kasutame üheklahvilisi kiirklahve, näiteks „m“ mikrofoni sisse/välja lülitamiseks.",
-  "Single-key keyboard shortcuts": "Üheklahvilised kiirklahvid",
-  "{{name}} (Waiting for video...)": "{{name}} (Ootame videovoo algust...)",
-  "This feature is only supported on Firefox.": "See funktsionaalsus on toetatud vaid Firefoxis.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Kui saadad meile vealogid, siis on lihtsam vea põhjust otsida.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ohoo, midagi on nüüd katki.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Ohoo, midagi on nüüd katki.</0>",
+  "Expose developer settings in the settings window.": "Näita seadistuste aknas arendajale vajalikke seadeid.",
+  "Developer Settings": "Arendaja seadistused",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Nõustudes selle beetaversiooni kasutamisega sa nõustud ka toote arendamiseks kasutatavate anonüümsete andmete kogumisega. Täpsemat teavet kogutavate andmete kohta leiad meie <2>Privaatsuspoliitikast</2> ja meie <5>Küpsiste kasutamise reeglitest</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Sa võid selle valiku eelmaldamisega alati oma nõusoleku tagasi võtta. Kui sul parasjagu on kõne pooleli, siis seadistuste muudatus jõustub pärast kõne lõppu.",
+  "Your feedback": "Sinu tagasiside",
+  "Thanks, we received your feedback!": "Tänud, me oleme sinu tagasiside kätte saanud!",
+  "Submitting…": "Saadan…",
+  "Submit": "Saada",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Kui selle rakenduse kasutamisel tekib sul probleeme või lihtsalt soovid oma arvamust avaldada, siis palun täida alljärgnev lühike kirjeldus.",
+  "Feedback": "Tagasiside",
+  "{{count}} stars|one": "{{count}} tärni",
+  "{{count}} stars|other": "{{count}} tärni",
+  "How did it go?": "Kuidas sujus?",
+  "{{displayName}}, your call has ended.": "{{displayName}}, sinu kõne on lõppenud.",
+  "<0>Thanks for your feedback!</0>": "<0>Täname Sind tagasiside eest!</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Meie rakenduse paremaks muutmiseks me hea meelega ootame Sinu arvamusi.</0>",
+  "Show connection stats": "Näita ühenduse statistikat",
+  "{{displayName}} is presenting": "{{displayName}} on esitlemas",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klõpsides „Jätka“, nõustud sa meie <2>Lõppkasutaja litsentsilepinguga (EULA)</2>",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klõpsides „Liitu kõnega kohe“, nõustud sa meie <2>Lõppkasutaja litsentsilepinguga (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Selles saidis on kasutusel ReCAPTCHA ja kehtivad Google'i <2>Privaatsuspoliitika</2> ning <6>Teenusetingimused</6>.<9></9>Klõpsides „Registreeru“, sa nõustud meie <12>Lõppkasutaja litsentsilepingu (EULA) tingimustega</12>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Seni kuni me testime skaleeritavust, siis Element Call ajutiselt pole läbivalt krüptitud.",
+  "Connectivity to the server has been lost.": "Võrguühendus serveriga on katkenud.",
+  "Retry sending logs": "Proovi uuesti logisid saata",
+  "You were disconnected from the call": "Sinu ühendus kõnega katkes",
+  "Reconnect": "Ühenda uuesti",
+  "Thanks!": "Tänud!",
+  "End-to-end encryption isn't supported on your browser.": "Sinu brauser ei toeta läbivat krüptimist.",
+  "Enable end-to-end encryption (password protected calls)": "Võta kasutusele läbiv krüptimine (salasõnaga kaitstud kõned)",
+  "Encrypted": "Krüptitud",
+  "End call": "Lõpeta kõne",
+  "Grid": "Ruudustik",
+  "Microphone off": "Mikrofon ei tööta",
+  "Microphone on": "Mikrofon töötab",
+  "Not encrypted": "Krüptimata",
+  "Share": "Jaga",
+  "Share this call": "Jaga seda kõnet",
+  "Sharing screen": "Ekraanivaade on jagamisel",
+  "{{count, number}}|one": "{{count, number}}",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "You": "Sina",
+  "Continue in browser": "Jätka veebibrauseris",
+  "Mute microphone": "Summuta mikrofon",
+  "Name of call": "Kõne nimi",
+  "Open in the app": "Ava rakenduses",
+  "Ready to join?": "Oled valmis liituma?",
+  "Select app": "Vali rakendus",
+  "Start new call": "Algata uus kõne",
+  "Back to recents": "Tagasi hiljutiste kõnede juurde",
+  "Stop video": "Peata videovoog",
+  "Start video": "Lülita videovoog sisse",
+  "Unmute microphone": "Lülita mikrofon sisse",
+  "Call not found": "Kõnet ei leidu",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Kõned on nüüd läbivalt krüptitud ning need pead looma kodulehelt. Sellega tagad, et kõik kasutavad samu krüptovõtmeid.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Sinu veebibrauser ei toeta meedia läbivat krüptimist. Toetatud brauserid on Chrome, Chromium, Safari ja Firefox >=117"
 }

public/locales/fa/app.json

@@ -1,140 +1,68 @@
 {
-  "Your recent calls": "تماس‌های اخیر شما",
-  "Video call": "تماس تصویری",
   "Video": "ویدیو",
   "Username": "نام کاربری",
-  "User ID": "آی دی کاربر",
-  "Turn on camera": "روشن کردن دوربین",
-  "Turn off camera": "خاموش کردن دوربین",
-  "Take me Home": "مرا به خانه ببر",
   "Speaker": "بلندگو",
   "Sign out": "خروج",
   "Sign in": "ورود",
   "Settings": "تنظیمات",
-  "Save": "ذخیره",
   "Profile": "پروفایل",
   "Password": "رمز عبور",
   "No": "خیر",
-  "Mute microphone": "بی‌صدا کردن میکروفون",
   "More": "بیشتر",
   "Microphone": "میکروفون",
   "Login to your account": "به حساب کاربری خود وارد شوید",
   "Login": "ورود",
   "Loading…": "بارگزاری…",
-  "Loading room…": "بارگزاری اتاق…",
-  "Leave": "خروج",
   "Join existing call?": "پیوست به تماس؟",
   "Join call now": "الان به تماس بپیوند",
   "Join call": "پیوستن به تماس",
-  "Invite people": "دعوت از افراد",
-  "Invite": "دعوت",
   "Home": "خانه",
   "Go": "رفتن",
   "Full screen": "تمام صحفه",
-  "Freedom": "آزادی",
   "Exit full screen": "خروج از حالت تمام صفحه",
   "Download debug logs": "دانلود لاگ عیب‌یابی",
   "Display name": "نام نمایشی",
   "Developer": "توسعه دهنده",
-  "Details": "جزئیات",
-  "Description (optional)": "توضیحات (اختیاری)",
   "Debug log request": "درخواست لاگ عیب‌یابی",
   "Debug log": "لاگ عیب‌یابی",
   "Create account": "ساخت حساب کاربری",
   "Copy and share this call link": "لینک تماس را کپی کنید و به اشتراک بگذارید",
   "Copied!": "کپی شد!",
-  "Connection lost": "ارتباط قطع شد",
   "Confirm password": "تایید رمزعبور",
   "Close": "بستن",
-  "Change layout": "تغییر طرح",
-  "Camera/microphone permissions needed to join the call.": "برای پیوستن به تماس، دسترسی به دوربین/ میکروفون نیاز است.",
-  "Camera {{n}}": "دوربین {{n}}",
   "Camera": "دوربین",
-  "Call type menu": "منوی نوع تماس",
-  "Call link copied": "لینک تماس کپی شد",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "با کلیک بر روی پیوستن به تماس، شما با <2>شرایط و قوانین استفاده</2> موافقت می‌کنید",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "با کلیک بر روی برو، شما با <2>شرایط و قوانین استفاده</2> موافقت می‌کنید",
   "Avatar": "آواتار",
   "Audio": "صدا",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "کاربر دیگری در این تماس مشکلی دارد. برای تشخیص بهتر مشکل، بهتر است ما لاگ عیب‌یابی را جمع‌آوری کنیم.",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "Accept microphone permissions to join the call.": "پذیرفتن دسترسی به میکروفون برای پیوستن به تماس.",
-  "Accept camera/microphone permissions to join the call.": "پذیرفتن دسترسی دوربین/ میکروفون برای پیوستن به تماس.",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>چرا یک رمز عبور برای حساب کاربری خود تنظیم نمی‌کنید؟</0><1>شما می‌توانید نام خود را حفظ کنید و یک آواتار برای تماس‌های آینده بسازید</1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>ساخت حساب کاربری</0> Or <2>دسترسی به عنوان میهمان</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>از قبل حساب کاربری دارید؟</0><1><0>ورود</0> Or <2>به عنوان یک میهمان وارد شوید</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - تماس واکی-تاکی",
-  "{{name}} is talking…": "{{name}} در حال صحبت است…",
-  "{{name}} is presenting": "{{name}} حاضر است",
-  "{{displayName}}, your call is now ended": "{{displayName}} تماس شما پایان یافت",
-  "{{count}} people connected|other": "{{count}} نفر متصل هستند",
-  "{{count}} people connected|one": "{{count}} فرد متصل هستند",
   "Local volume": "حجم داخلی",
   "Inspector": "بازرس",
-  "Incompatible versions!": "نسخه‌های ناسازگار!",
-  "Incompatible versions": "نسخه‌های ناسازگار",
   "Spotlight": "نور افکن",
-  "Speaker {{n}}": "بلندگو {{n}}",
   "Show call inspector": "نمایش بازرس تماس",
   "Share screen": "اشتراک گذاری صفحه نمایش",
   "Sending…": "در حال ارسال…",
   "Sending debug logs…": "در حال ارسال باگ‌های عیب‌یابی…",
   "Send debug logs": "ارسال لاگ‌های عیب‌یابی",
   "Select an option": "یک گزینه را انتخاب کنید",
-  "Saving…": "در حال ذخیره…",
   "Return to home screen": "برگشت به صفحه اصلی",
   "Remove": "حذف",
-  "Release to stop": "برای توقف رها کنید",
-  "Release spacebar key to stop": "اسپیس بار را برای توقف رها کنید",
   "Registering…": "ثبت‌نام…",
   "Register": "ثبت‌نام",
   "Recaptcha not loaded": "کپچا بارگیری نشد",
   "Recaptcha dismissed": "ریکپچا رد شد",
-  "Press and hold to talk over {{name}}": "برای صحبت فشار دهید و نگه‌دارید {{name}}",
-  "Press and hold to talk": "برای صحبت فشار دهید و نگه‌دارید",
-  "Press and hold spacebar to talk over {{name}}": "برای صحبت کردن دکمه اسپیس بار را فشار دهید و نگه دارید {{name}}",
-  "Press and hold spacebar to talk": "برای صحبت کردن کلید فاصله را فشار داده و نگه دارید",
   "Passwords must match": "رمز عبور باید همخوانی داشته باشد",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "کاربران دیگر تلاش می‌کنند با ورژن‌های ناسازگار به مکالمه بپیوندند. این کاربران باید از بروزرسانی مرورگرشان اطمینان داشته باشند:<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "هنوز ثبت‌نام نکرده‌اید؟ <2>ساخت حساب کاربری</2>",
   "Not now, return to home screen": "الان نه، به صفحه اصلی برگردید",
-  "More menu": "تنظیمات بیشتر",
-  "Microphone permissions needed to join the call.": "برای پیوستن به مکالمه دسترسی به میکروفون نیاز است.",
-  "Microphone {{n}}": "میکروفون {{n}}",
   "Logging in…": "ورود…",
   "Include debug logs": "شامل لاگ‌های عیب‌یابی",
-  "Having trouble? Help us fix it.": "با مشکلی رو به رو شدید؟ به ما کمک کنید رفعش کنیم.",
-  "Grid layout menu": "منوی طرح‌بندی شبکه‌ای",
-  "Fetching group call timed out.": "زمان اتصال به مکالمه گروهی تمام شد.",
-  "You can't talk at the same time": "نمی توانید هم‌زمان صحبت کنید",
   "Yes, join call": "بله، به تماس بپیوندید",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC (ارتباطات رسانه‌ای بلادرنگ مانند انتقال صدا، ویدئو و داده‌) در این مرورگر پشتیبانی نمی‌شود یا در حال مسدود شدن است.",
-  "Walkie-talkie call name": "نامِ تماسِ واکی-تاکی",
-  "Walkie-talkie call": "تماسِ واکی-تاکی",
   "Waiting for other participants…": "در انتظار برای دیگر شرکت‌کنندگان…",
-  "Waiting for network": "در انتظار شبکه",
-  "Video call name": "نامِ تماسِ تصویری",
   "Version: {{version}}": "نسخه: {{نسخه}}",
   "User menu": "فهرست کاربر",
-  "Unmute microphone": "ناخموشی میکروفون",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "این کار باعث می‌شود به نظر برسد صدای بلندگو از جایی که کاشی‌اش روی صفحه قرار گرفته می‌آید (ویژگی آزمایشی: ممکن است بر پایداری صدا تأثیر بگذارد.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "این سایت توسط ReCAPTCHA محافظت می شود و <2>خط مشی رازداری</2> و <6>شرایط خدمات</6> Google اعمال می شود.<9></9>با کلیک کردن بر روی \"ثبت نام\"، شما با <12 >شرایط و ضوابط </12> ما موافقت می کنید",
   "This call already exists, would you like to join?": "این تماس از قبل وجود دارد، می‌خواهید بپیوندید؟",
-  "Thanks! We'll get right on it.": "با تشکر! ما به درستی آن را انجام خواهیم داد.",
-  "Talking…": "در حال صحبت کردن…",
-  "Talk over speaker": "روی بلندگو صحبت کنید",
-  "Submitting feedback…": "در حال ارسال بازخورد…",
   "Submit feedback": "بازخورد ارائه دهید",
-  "Stop sharing screen": "توقف اشتراک‌گذاری صفحه نمایش",
-  "Spatial audio": "صدای جهت‌دار",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "این که میان‌برهای صفحه‌کلید تک‌کلیده مثل m برای خموشی و ناخموشی میکروفون به کار بیفتند یا نه.",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "داده‌های ناشناس شده (از اطَلاعاتی مثل طول تماس و شمارهٔ طرف‌ها) را به گروه تماس المنت فرستاده تا در بهینه‌سازی برنامه بر پایهٔ چگونگی استفاده‌اش یاریمان کنند.",
-  "Single-key keyboard shortcuts": "میان‌برهای صفحه‌کلید تک‌کلیده",
   "Element Call Home": "خانهٔ تماس المنت",
-  "Copy": "رونوشت",
+  "Copy": "رونوشت"
-  "Allow analytics": "نمایش تجزیه‌ها",
-  "Advanced": "پیش رفته",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>اکنون به تماس پیوسته</0><1>یا</1><2>پیوند تماس را رونوشت کرده و بعداً بپیوندید</2>",
-  "{{name}} (Waiting for video...)": "{{name}} (منتظر تصویر…)",
-  "{{name}} (Connecting...)": "{{name}} (وصل شدن…)"
 }

public/locales/fr/app.json

@@ -1,81 +1,48 @@
 {
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Créer un compte</0> Or <2>Accès invité</2>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Pourquoi ne pas créer un mot de passe pour conserver votre compte ?</0><1>Vous pourrez garder votre nom et définir un avatar pour vos futurs appels</1>",
-  "Accept camera/microphone permissions to join the call.": "Autorisez l’accès à votre caméra et microphone pour rejoindre l’appel.",
-  "Accept microphone permissions to join the call.": "Autorisez l’accès au microphone pour rejoindre l’appel.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Un autre utilisateur dans cet appel a un problème. Pour nous permettre de résoudre le problème, nous aimerions récupérer un journal de débogage.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "En cliquant sur « Commencer » vous acceptez nos <2>conditions d’utilisation</2>",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "En cliquant sur « Rejoindre l’appel » vous acceptez nos <2>conditions d’utilisation</2>",
-  "Call link copied": "Lien de l’appel copié",
-  "Call type menu": "Menu de type d’appel",
   "Camera": "Caméra",
-  "Camera {{n}}": "Caméra {{n}}",
-  "Camera/microphone permissions needed to join the call.": "Accès à la caméra et au microphone requis pour rejoindre l’appel.",
-  "Change layout": "Changer la disposition",
   "Close": "Fermer",
   "Confirm password": "Confirmer le mot de passe",
-  "Connection lost": "Connexion interrompue",
   "Copied!": "Copié !",
   "Copy and share this call link": "Copier et partager le lien de cet appel",
   "Create account": "Créer un compte",
   "Debug log": "Journal de débogage",
   "Debug log request": "Demande d’un journal de débogage",
-  "Description (optional)": "Description (facultatif)",
-  "Details": "Informations",
   "Developer": "Développeur",
   "Display name": "Nom d’affichage",
   "Download debug logs": "Télécharger les journaux de débogage",
   "Exit full screen": "Quitter le plein écran",
-  "Freedom": "Libre",
   "Full screen": "Plein écran",
   "Go": "Commencer",
-  "Grid layout menu": "Menu en grille",
-  "Having trouble? Help us fix it.": "Un problème ? Aidez nous à le résoudre.",
   "Home": "Accueil",
   "Include debug logs": "Inclure les journaux de débogage",
-  "Incompatible versions": "Versions incompatibles",
-  "Incompatible versions!": "Versions incompatibles !",
   "Inspector": "Inspecteur",
-  "Invite people": "Inviter des gens",
   "Join call": "Rejoindre l’appel",
   "Join call now": "Rejoindre l’appel maintenant",
   "Join existing call?": "Rejoindre un appel existant ?",
-  "Leave": "Partir",
-  "Loading room…": "Chargement du salon…",
   "Loading…": "Chargement…",
   "Local volume": "Volume local",
   "Logging in…": "Connexion…",
   "Login": "Connexion",
   "Login to your account": "Connectez vous à votre compte",
   "Microphone": "Microphone",
-  "Microphone permissions needed to join the call.": "Accès au microphone requis pour rejoindre l’appel.",
-  "Microphone {{n}}": "Microphone {{n}}",
   "More": "Plus",
-  "More menu": "Menu plus",
-  "Mute microphone": "Couper le micro",
   "No": "Non",
   "Not now, return to home screen": "Pas maintenant, retourner à l’accueil",
   "Not registered yet? <2>Create an account</2>": "Pas encore de compte ? <2>En créer un</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Des utilisateurs essayent de rejoindre cet appel à partir de versions incompatibles. Ces utilisateurs doivent rafraîchir la page dans leur navigateur : <1>{userLis}</1>",
   "Password": "Mot de passe",
   "Passwords must match": "Les mots de passe doivent correspondre",
-  "Press and hold spacebar to talk": "Appuyez et maintenez la barre d’espace enfoncée pour parler",
-  "Press and hold spacebar to talk over {{name}}": "Appuyez et maintenez la barre d’espace enfoncée pour parler par dessus {{name}}",
-  "Press and hold to talk": "Appuyez et maintenez enfoncé pour parler",
-  "Press and hold to talk over {{name}}": "Appuyez et maintenez enfoncé pour parler par dessus {{name}}",
   "Profile": "Profil",
   "Recaptcha dismissed": "Recaptcha refusé",
   "Recaptcha not loaded": "Recaptcha non chargé",
   "Register": "S’enregistrer",
   "Registering…": "Enregistrement…",
-  "Release spacebar key to stop": "Relâcher la barre d’espace pour arrêter",
-  "Release to stop": "Relâcher pour arrêter",
   "Remove": "Supprimer",
   "Return to home screen": "Retour à l’accueil",
-  "Save": "Enregistrer",
-  "Saving…": "Enregistrement…",
   "Select an option": "Sélectionnez une option",
   "Send debug logs": "Envoyer les journaux de débogage",
   "Sending…": "Envoi…",
@@ -84,60 +51,76 @@
   "Show call inspector": "Afficher l’inspecteur d’appel",
   "Sign in": "Connexion",
   "Sign out": "Déconnexion",
-  "Spatial audio": "Audio spatialisé",
   "Spotlight": "Premier plan",
-  "Stop sharing screen": "Arrêter le partage d’écran",
+  "Submit feedback": "Envoyer un commentaire",
-  "Submit feedback": "Envoyer des retours",
-  "Submitting feedback…": "Envoi des retours…",
-  "Take me Home": "Retouner à l’accueil",
-  "Talk over speaker": "Parler par dessus l’intervenant",
-  "Thanks! We'll get right on it.": "Merci ! Nous allons nous y attaquer.",
   "This call already exists, would you like to join?": "Cet appel existe déjà, voulez-vous le rejoindre ?",
-  "{{name}} is presenting": "{{name}} est le présentateur",
-  "Fetching group call timed out.": "Échec de connexion à l’appel de groupe dans le temps imparti.",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} — Appel talkie-walkie",
-  "{{name}} is talking…": "{{name}} est en train de parler…",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{displayName}}, your call is now ended": "{{displayName}}, votre appel est désormais terminé",
-  "{{count}} people connected|other": "{{count}} personnes connectées",
-  "{{count}} people connected|one": "{{count}} personne connectée",
-  "Your recent calls": "Appels récents",
-  "You can't talk at the same time": "Vous ne pouvez pas parler en même temps",
   "Yes, join call": "Oui, rejoindre l’appel",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC n’est pas pris en charge ou est bloqué par ce navigateur.",
-  "Walkie-talkie call name": "Nom de l’appel talkie-walkie",
-  "Walkie-talkie call": "Appel talkie-walkie",
   "Waiting for other participants…": "En attente d’autres participants…",
-  "Waiting for network": "En attente du réseau",
-  "Video call name": "Nom de l’appel vidéo",
-  "Video call": "Appel vidéo",
   "Video": "Vidéo",
   "Version: {{version}}": "Version : {{version}}",
   "Username": "Nom d’utilisateur",
   "User menu": "Menu utilisateur",
-  "User ID": "Identifiant utilisateur",
-  "Unmute microphone": "Allumer le micro",
-  "Turn on camera": "Allumer la caméra",
-  "Turn off camera": "Couper la caméra",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Cela donnera l’impression que le son de l’intervenant provient de là où leur tuile est positionnée sur l’écran. (Fonctionnalité expérimentale : ceci pourrait avoir un impact sur la stabilité du son.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Ce site est protégé par ReCAPTCHA, la <2>politique de confidentialité</2> et les <6>conditions d’utilisation</6> de Google s’appliquent.<9></9>En cliquant sur « S’enregistrer » vous acceptez également nos <12>conditions d’utilisation</12>",
-  "Talking…": "Vous parlez…",
-  "Speaker {{n}}": "Intervenant {{n}}",
   "Speaker": "Intervenant",
-  "Invite": "Inviter",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Vous avez déjà un compte ?</0><1><0>Se connecter</0> Ou <2>Accès invité</2></1>",
   "Sending debug logs…": "Envoi des journaux de débogage…",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Rejoindre l’appel maintenant</0><1>Ou</1><2>Copier le lien de l’appel et rejoindre plus tard</2>",
-  "{{name}} (Connecting...)": "{{name}} (Connexion…)",
-  "Allow analytics": "Autoriser les statistiques",
-  "Advanced": "Avancé",
   "Element Call Home": "Accueil Element Call",
   "Copy": "Copier",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Cela enverra des données anonymisées (telles que la durée d’un appel et le nombre de participants) à l’équipe de Element Call pour aider à optimiser l’application en fonction de l’utilisation.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Bascule sur les raccourcis clavier à touche unique, par exemple « m » pour désactiver / activer le micro.",
-  "Single-key keyboard shortcuts": "Raccourcis clavier en une touche",
-  "{{name}} (Waiting for video...)": "{{name}} (En attente de vidéo…)",
-  "This feature is only supported on Firefox.": "Cette fonctionnalité est prise en charge dans Firefox uniquement.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Soumettre les journaux de débogage nous aidera à déterminer le problème.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Oups, quelque chose s’est mal passé.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Oups, quelque chose s’est mal passé.</0>",
+  "Expose developer settings in the settings window.": "Affiche les paramètres développeurs dans la fenêtre des paramètres.",
+  "Developer Settings": "Paramètres développeurs",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "En participant à cette beta, vous consentez à la collecte de données anonymes, qui seront utilisées pour améliorer le produit. Vous trouverez plus d’informations sur les données collectées dans notre <2>Politique de vie privée</2> et notre <5>Politique de cookies</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Vous pouvez retirer votre consentement en décochant cette case. Si vous êtes actuellement en communication, ce paramètre prendra effet à la fin de l’appel.",
+  "Your feedback": "Votre commentaire",
+  "Thanks, we received your feedback!": "Merci, nous avons reçu vos commentaires !",
+  "Submitting…": "Envoi…",
+  "Submit": "Envoyer",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Si vous rencontrez des problèmes, ou vous voulez simplement faire un commentaire, faites-en une courte description ci-dessous.",
+  "Feedback": "Commentaires",
+  "{{count}} stars|other": "{{count}} favoris",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Nous aimerions avoir vos commentaires afin que nous puissions améliorer votre expérience.</0>",
+  "{{count}} stars|one": "{{count}} favori",
+  "{{displayName}}, your call has ended.": "{{displayName}}, votre appel est terminé.",
+  "<0>Thanks for your feedback!</0>": "<0>Merci pour votre commentaire !</0>",
+  "How did it go?": "Comment cela s’est-il passé ?",
+  "{{displayName}} is presenting": "{{displayName}} est à l’écran",
+  "Show connection stats": "Afficher les statistiques de la connexion",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "En cliquant sur « Rejoindre l’appel maintenant », vous acceptez notre <2>Contrat de Licence Utilisateur Final (CLUF)</2>",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "En cliquant sur « Commencer », vous acceptez notre <2>Contrat de Licence Utilisateur Final (CLUF)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Ce site est protégé par ReCAPTCHA, la <2>politique de confidentialité</2> et les <6>conditions d’utilisation</6> de Google s’appliquent.<9></9>En cliquant sur « S’enregistrer » vous acceptez également notre <12>Contrat de Licence Utilisateur Final (CLUF)</12>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call n’est temporairement plus chiffré de bout en bout le temps de tester l’extensibilité.",
+  "Reconnect": "Se reconnecter",
+  "Retry sending logs": "Réessayer d’envoyer les journaux",
+  "Thanks!": "Merci !",
+  "You were disconnected from the call": "Vous avez été déconnecté de l’appel",
+  "Connectivity to the server has been lost.": "La connexion avec le serveur a été perdue.",
+  "End-to-end encryption isn't supported on your browser.": "Le chiffrement de bout-en-bout n’est pas pris en charge par votre navigateur.",
+  "Enable end-to-end encryption (password protected calls)": "Activer le chiffrement de bout-en-bout (appels protégés par mot de passe)",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "Encrypted": "Chiffré",
+  "End call": "Terminer l’appel",
+  "Grid": "Grille",
+  "Microphone off": "Microphone éteint",
+  "Microphone on": "Microphone allumé",
+  "Share": "Partager",
+  "Share this call": "Partager cet appel",
+  "Sharing screen": "L’écran est partagé",
+  "{{count, number}}|one": "{{count, number}}",
+  "Not encrypted": "Non chiffré",
+  "You": "Vous",
+  "Continue in browser": "Continuer dans le navigateur",
+  "Mute microphone": "Couper le microphone",
+  "Name of call": "Nom de l’appel",
+  "Open in the app": "Ouvrir dans l’application",
+  "Ready to join?": "Prêt à rejoindre ?",
+  "Select app": "Choisissez l’application",
+  "Start new call": "Démarrer un nouvel appel",
+  "Back to recents": "Revenir à l’historique des appels",
+  "Start video": "Démarrer la vidéo",
+  "Stop video": "Arrêter la vidéo",
+  "Unmute microphone": "Allumer le microphone",
+  "Call not found": "Appel non trouvé",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Les appels sont maintenant chiffrés de bout-en-bout et doivent être créés depuis la page d’accueil. Cela permet d’être sûr que tout le monde utilise la même clé de chiffrement.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Votre navigateur web ne prend pas en charge le chiffrement de bout-en-bout des médias. Les navigateurs pris en charge sont Chrome, Safari, Firefox >= 117"
 }

public/locales/id/app.json

@@ -2,83 +2,48 @@
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Sudah punya akun?</0><1><0>Masuk</0> Atau <2>Akses sebagai tamu</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Buat akun</0> Atau <2>Akses sebagai tamu</2>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Kenapa tidak selesaikan dengan mengatur sebuah kata sandi untuk menjaga akun Anda?</0><1>Anda akan dapat tetap menggunakan nama Anda dan atur sebuah avatar untuk digunakan dalam panggilan di masa mendatang</1>",
-  "Accept camera/microphone permissions to join the call.": "Terima izin kamera/mikrofon untuk bergabung ke panggilan.",
-  "Accept microphone permissions to join the call.": "Terima izin mikrofon untuk bergabung ke panggilan.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Pengguna yang lain di panggilan ini sedang mengalami masalah. Supaya dapat mendiagnosa masalah ini, kami ingin mengumpulkan sebuah catatan pengawakutuan.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Dengan mengeklik \"Bergabung\", Anda terima <2>syarat dan ketentuan</2> kami",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Dengan mengeklik \"Bergabung ke panggilan sekarang\", Anda terima <2>syarat dan ketentuan</2> kami",
-  "Call link copied": "Tautan panggilan disalin",
-  "Call type menu": "Menu jenis panggilan",
   "Camera": "Kamera",
-  "Camera {{n}}": "Kamera {{n}}",
-  "Camera/microphone permissions needed to join the call.": "Izin kamera/mikrofon dibutuhkan untuk bergabung ke panggilan.",
-  "Change layout": "Ubah tata letak",
   "Close": "Tutup",
   "Confirm password": "Konfirmasi kata sandi",
-  "Connection lost": "Koneksi hilang",
   "Copied!": "Disalin!",
   "Copy and share this call link": "Salin dan bagikan tautan panggilan ini",
   "Create account": "Buat akun",
   "Debug log": "Catatan pengawakutuan",
   "Debug log request": "Permintaan catatan pengawakutuan",
-  "Description (optional)": "Deskripsi (opsional)",
-  "Details": "Detail",
   "Developer": "Pengembang",
   "Display name": "Nama tampilan",
   "Download debug logs": "Unduh catatan pengawakutuan",
   "Exit full screen": "Keluar dari layar penuh",
-  "Fetching group call timed out.": "Waktu pendapatan panggilan grup habis.",
-  "Freedom": "Bebas",
   "Full screen": "Layar penuh",
   "Go": "Bergabung",
-  "Grid layout menu": "Menu tata letak kisi",
-  "Having trouble? Help us fix it.": "Mengalami masalah? Bantu kami memperbaikinya.",
   "Home": "Beranda",
   "Include debug logs": "Termasuk catatan pengawakutuan",
-  "Incompatible versions": "Versi tidak kompatibel",
-  "Incompatible versions!": "Versi tidak kompatibel!",
   "Inspector": "Inspektur",
-  "Invite": "Undang",
-  "Invite people": "Undang orang",
   "Join call": "Bergabung ke panggilan",
   "Join call now": "Bergabung ke panggilan sekarang",
   "Join existing call?": "Bergabung ke panggilan yang sudah ada?",
-  "Leave": "Keluar",
-  "Loading room…": "Memuat ruangan…",
   "Loading…": "Memuat…",
   "Local volume": "Volume lokal",
   "Logging in…": "Memasuki…",
   "Login": "Masuk",
   "Login to your account": "Masuk ke akun Anda",
   "Microphone": "Mikrofon",
-  "Microphone permissions needed to join the call.": "Izin mikrofon dibutuhkan untuk bergabung ke panggilan ini.",
-  "Microphone {{n}}": "Mikrofon {{n}}",
   "More": "Lainnya",
-  "More menu": "Menu lainnya",
-  "Mute microphone": "Bisukan mikrofon",
   "No": "Tidak",
   "Not now, return to home screen": "Tidak sekarang, kembali ke layar beranda",
   "Not registered yet? <2>Create an account</2>": "Belum terdaftar? <2>Buat sebuah akun</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Pengguna lain sedang mencoba bergabung ke panggilan ini dari versi yang tidak kompatibel. Pengguna berikut seharusnya memastikan bahwa mereka telah memuat ulang peramban mereka: <1>{userLis}</1>",
   "Password": "Kata sandi",
   "Passwords must match": "Kata sandi harus cocok",
-  "Press and hold spacebar to talk": "Tekan dan tahan bilah spasi untuk berbicara",
-  "Press and hold spacebar to talk over {{name}}": "Tekan dan tahan bilah spasi untuk berbicara pada {{name}}",
-  "Press and hold to talk": "Tekan dan tahan untuk berbicara",
-  "Press and hold to talk over {{name}}": "Tekan dan tahan untuk berbicara pada {{name}}",
   "Profile": "Profil",
   "Recaptcha dismissed": "Recaptcha ditutup",
   "Recaptcha not loaded": "Recaptcha tidak dimuat",
   "Register": "Daftar",
   "Registering…": "Mendaftarkan…",
-  "Release spacebar key to stop": "Lepaskan bilah spasi untuk berhenti",
-  "Release to stop": "Lepaskan untuk berhenti",
   "Remove": "Hapus",
   "Return to home screen": "Kembali ke layar beranda",
-  "Save": "Simpan",
-  "Saving…": "Menyimpan…",
   "Select an option": "Pilih sebuah opsi",
   "Send debug logs": "Kirim catatan pengawakutuan",
   "Sending…": "Mengirimkan…",
@@ -87,57 +52,75 @@
   "Show call inspector": "Tampilkan inspektur panggilan",
   "Sign in": "Masuk",
   "Sign out": "Keluar",
-  "Spatial audio": "Audio spasial",
   "Speaker": "Pembicara",
-  "Speaker {{n}}": "Pembicara {{n}}",
   "Spotlight": "Sorotan",
-  "Stop sharing screen": "Berhenti membagikan layar",
   "Submit feedback": "Kirim masukan",
-  "Submitting feedback…": "Mengirimkan masukan…",
-  "Take me Home": "Bawa saya ke Beranda",
-  "Talk over speaker": "Bicara pada pembicara",
-  "Talking…": "Berbicara…",
-  "Thanks! We'll get right on it.": "Terima kasih! Kami akan melihatnya.",
   "This call already exists, would you like to join?": "Panggilan ini sudah ada, apakah Anda ingin bergabung?",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Situs ini dilindungi oleh ReCAPTCHA dan <2>Kebijakan Privasi</2> dan <6>Ketentuan Layanan</6> Google berlaku.<9>Dengan mengeklik \"Daftar\", Anda terima <12>syarat dan ketentuan</12> kami",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Ini akan membuat suara pembicara seolah-olah berasal dari tempat ubin mereka diposisikan di layar. (Fitur uji coba: ini dapat memengaruhi stabilitas audio.)",
-  "Turn off camera": "Matikan kamera",
-  "Turn on camera": "Nyalakan kamera",
-  "Unmute microphone": "Suarakan mikrofon",
-  "User ID": "ID pengguna",
   "User menu": "Menu pengguna",
   "Username": "Nama pengguna",
   "Version: {{version}}": "Versi: {{version}}",
   "Video": "Video",
-  "Video call": "Panggilan video",
-  "Video call name": "Nama panggilan video",
-  "Waiting for network": "Menunggu jaringan",
   "Waiting for other participants…": "Menunggu peserta lain…",
-  "Walkie-talkie call": "Panggilan protofon",
-  "Walkie-talkie call name": "Nama panggilan protofon",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC tidak didukung atau diblokir di peramban ini.",
   "Yes, join call": "Ya, bergabung ke panggilan",
-  "You can't talk at the same time": "Anda tidak dapat berbicara pada waktu yang sama",
-  "Your recent calls": "Panggilan Anda terkini",
-  "{{count}} people connected|one": "{{count}} orang terhubung",
-  "{{count}} people connected|other": "{{count}} orang terhubung",
-  "{{displayName}}, your call is now ended": "{{displayName}}, panggilan Anda sekarang telah berakhir",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is presenting": "{{name}} sedang mempresentasi",
-  "{{name}} is talking…": "{{name}} sedang berbicara…",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Panggilan protofon",
   "Sending debug logs…": "Mengirimkan catatan pengawakutuan…",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Bergabung panggilan sekarang</0><1>Atau</1><2>Salin tautan dan bergabung nanti</2>",
-  "{{name}} (Connecting...)": "{{name}} (Menghubungkan...)",
-  "Allow analytics": "Perbolehkan analitik",
-  "Advanced": "Tingkat lanjut",
   "Element Call Home": "Beranda Element Call",
   "Copy": "Salin",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Ini akan mengirimkan data anonim (seperti durasi dan jumlah peserta panggilan) ke tim Element Call untuk membantu kami mengoptimalkan aplikasi berdasarkan bagaimana penggunaannya.",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Apakah pintasan papan ketik seharusnya diaktifkan, mis. 'm' untuk membisukan/menyuarakan mikrofon.",
-  "Single-key keyboard shortcuts": "Pintasan papan ketik satu tombol",
-  "{{name}} (Waiting for video...)": "{{name}} (Menunggu video...)",
-  "This feature is only supported on Firefox.": "Fitur ini hanya didukung di Firefox.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Mengirim catatan pengawakutuan akan membantu kami melacak masalahnya.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Aduh, ada yang salah.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Aduh, ada yang salah.</0>",
+  "Expose developer settings in the settings window.": "Ekspos pengaturan pengembang dalam jendela pengaturan.",
+  "Developer Settings": "Pengaturan Pengembang",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Dengan bergabung dalam beta ini, Anda mengizinkan kami untuk mengumpulkan data anonim, yang kami gunakan untuk meningkatkan produk ini. Anda dapat mempelajari lebih lanjut tentang data apa yang kami lacak dalam <2>Kebijakan Privasi</2> dan <5>Kebijakan Kuki</5> kami.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Anda dapat mengurungkan kembali izin dengan mencentang kotak ini. Jika Anda saat ini dalam panggilan, pengaturan ini akan diterapkan di akhir panggilan.",
+  "Feedback": "Masukan",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Jika Anda mengalami masalah atau hanya ingin memberikan masukan, silakan kirimkan kami deskripsi pendek di bawah.",
+  "Submit": "Kirim",
+  "Submitting…": "Mengirim…",
+  "Thanks, we received your feedback!": "Terima kasih, kami telah menerima masukan Anda!",
+  "Your feedback": "Masukan Anda",
+  "{{displayName}}, your call has ended.": "{{displayName}}, panggilan Anda telah berakhir.",
+  "<0>Thanks for your feedback!</0>": "<0>Terima kasih atas masukan Anda!</0>",
+  "How did it go?": "Bagaimana rasanya?",
+  "{{count}} stars|one": "{{count}} bintang",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Kami ingin mendengar masukan Anda supaya kami bisa meningkatkan pengalaman Anda.</0>",
+  "Show connection stats": "Tampilkan statistik koneksi",
+  "{{displayName}} is presenting": "{{displayName}} sedang menampilkan",
+  "{{count}} stars|other": "{{count}} bintang",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Dengan mengeklik \"Bergabung\", Anda menyetujui <2>Perjanjian Lisensi Pengguna Akhir (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Situs ini dilindungi oleh reCAPTCHA dan <2>Kebijakan Privasi</2> dan <6>Ketentuan Layanan</6> Google berlaku.<9></9>Dengan mengeklik \"Daftar\", Anda menyetujui <12>Perjanjian Lisensi Pengguna Akhir (EULA)</12> kami",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Dengan mengeklik \"Bergabung ke panggilan sekarang\", Anda menyetujui <2>Perjanjian Lisensi Pengguna Akhir (EULA)</2> kami",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call sementara tidak dienkripsi secara ujung ke ujung selagi kami menguji skalabilitas.",
+  "Connectivity to the server has been lost.": "Koneksi ke server telah hilang.",
+  "Enable end-to-end encryption (password protected calls)": "Aktifkan enkripsi ujung ke ujung (panggilan terlindungi oleh kata sandi)",
+  "End-to-end encryption isn't supported on your browser.": "Enkripsi ujung ke ujung tidak didukung di peramban Anda.",
+  "Retry sending logs": "Kirim ulang catatan",
+  "You were disconnected from the call": "Anda terputus dari panggilan",
+  "Reconnect": "Hubungkan ulang",
+  "Thanks!": "Terima kasih!",
+  "{{count, number}}|other": "{{count, number}}",
+  "Encrypted": "Terenkripsi",
+  "End call": "Akhiri panggilan",
+  "Grid": "Kisi",
+  "Microphone off": "Mikrofon dimatikan",
+  "Microphone on": "Mikrofon dinyalakan",
+  "Not encrypted": "Tidak terenkripsi",
+  "Share": "Bagikan",
+  "Share this call": "Bagikan panggilan ini",
+  "Sharing screen": "Berbagi layar",
+  "{{count, number}}|one": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "You": "Anda",
+  "Continue in browser": "Lanjutkan dalam peramban",
+  "Mute microphone": "Matikan mikrofon",
+  "Name of call": "Nama panggilan",
+  "Open in the app": "Buka dalam aplikasi",
+  "Ready to join?": "Siap untuk bergabung?",
+  "Select app": "Pilih plikasi",
+  "Start new call": "Mulai panggilan baru",
+  "Start video": "Nyalakan video",
+  "Stop video": "Matikan video",
+  "Unmute microphone": "Nyalakan mikrofon",
+  "Back to recents": "Kembali ke terkini",
+  "Call not found": "Panggilan tidak ditemukan",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Panggilan sekarang terenkripsi secara ujung ke ujung dan harus dibuat dari laman beranda. Ini memastikan bahwa semuanya menggunakan kunci enkripsi yang sama.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Peramban web Anda tidak mendukung enkripsi media ujung ke ujung. Peramban yang didukung adalah Chrome, Safari, dan Firefox >=117"
 }

public/locales/it/app.json

@@ -0,0 +1,125 @@
+{
+  "{{count, number}}|one": "{{count, number}}",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{count}} stars|one": "{{count}} stelle",
+  "{{count}} stars|other": "{{count}} stelle",
+  "{{displayName}} is presenting": "{{displayName}} sta presentando",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Hai già un profilo?</0><1><0>Accedi</0> o <2>Accedi come ospite</2></1>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Crea un profilo</0> o <2>Accedi come ospite</2>",
+  "<0>Oops, something's gone wrong.</0>": "<0>Ops, qualcosa è andato storto.</0>",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>L'invio di registri di debug ci aiuterà ad individuare il problema.</0>",
+  "<0>Thanks for your feedback!</0>": "<0>Grazie per la tua opinione!</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Vorremmo sapere la tua opinione in modo da migliorare l'esperienza.</0>",
+  "Audio": "Audio",
+  "Avatar": "Avatar",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Cliccando \"Vai\", accetti il nostro <2>accordo di licenza con l'utente finale (EULA)</2>",
+  "Camera": "Fotocamera",
+  "Close": "Chiudi",
+  "Confirm password": "Conferma password",
+  "Connectivity to the server has been lost.": "La connessione al server è stata persa.",
+  "Copied!": "Copiato!",
+  "Copy": "Copia",
+  "Copy and share this call link": "Copia e condividi questo collegamento alla chiamata",
+  "Create account": "Crea profilo",
+  "Debug log": "Registro di debug",
+  "Debug log request": "Richiesta registro di debug",
+  "Developer": "Sviluppatore",
+  "Developer Settings": "Impostazioni per sviluppatori",
+  "Display name": "Nome da mostrare",
+  "Download debug logs": "Scarica registri di debug",
+  "Element Call Home": "Inizio di Element Call",
+  "Enable end-to-end encryption (password protected calls)": "Attiva crittografia end-to-end (chiamate protette da password)",
+  "Encrypted": "Cifrata",
+  "End call": "Termina chiamata",
+  "Exit full screen": "Esci da schermo intero",
+  "Expose developer settings in the settings window.": "Mostra le impostazioni per sviluppatori nella finestra delle impostazioni.",
+  "Feedback": "Feedback",
+  "Full screen": "Schermo intero",
+  "Go": "Vai",
+  "Grid": "Griglia",
+  "Home": "Pagina iniziale",
+  "How did it go?": "Com'è andata?",
+  "Include debug logs": "Includi registri di debug",
+  "Join call": "Entra in chiamata",
+  "Join call now": "Entra in chiamata ora",
+  "Loading…": "Caricamento…",
+  "Local volume": "Volume locale",
+  "Logging in…": "Accesso…",
+  "Login": "Accedi",
+  "Login to your account": "Accedi al tuo profilo",
+  "Microphone": "Microfono",
+  "Microphone off": "Microfono spento",
+  "Microphone on": "Microfono acceso",
+  "More": "Altro",
+  "No": "No",
+  "Not encrypted": "Non cifrata",
+  "Inspector": "Ispettore",
+  "Join existing call?": "Entrare in una chiamata esistente?",
+  "Not registered yet? <2>Create an account</2>": "Non hai ancora un profilo? <2>Creane uno</2>",
+  "Password": "Password",
+  "Passwords must match": "Le password devono coincidere",
+  "Profile": "Profilo",
+  "Recaptcha dismissed": "Recaptcha annullato",
+  "Recaptcha not loaded": "Recaptcha non caricato",
+  "Reconnect": "Riconnetti",
+  "Register": "Registra",
+  "Registering…": "Registrazione…",
+  "Remove": "Rimuovi",
+  "Retry sending logs": "Riprova l'invio dei registri",
+  "Return to home screen": "Torna alla schermata di iniziale",
+  "Select an option": "Seleziona un'opzione",
+  "Send debug logs": "Invia registri di debug",
+  "Sending debug logs…": "Invio dei registri di debug…",
+  "Sending…": "Invio…",
+  "Settings": "Impostazioni",
+  "Share": "Condividi",
+  "Share screen": "Condividi schermo",
+  "Share this call": "Condividi questa chiamata",
+  "Sharing screen": "Condivisione schermo",
+  "Show connection stats": "Mostra statistiche connessione",
+  "Sign in": "Accedi",
+  "Sign out": "Disconnetti",
+  "Speaker": "Altoparlante",
+  "Submit": "Invia",
+  "Submit feedback": "Invia commento",
+  "Show call inspector": "Mostra ispettore della chiamata",
+  "Spotlight": "In primo piano",
+  "Thanks, we received your feedback!": "Grazie, abbiamo ricevuto il tuo commento!",
+  "Thanks!": "Grazie!",
+  "This call already exists, would you like to join?": "Questa chiamata esiste già, vuoi entrare?",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Questo sito è protetto da ReCAPTCHA e si applicano l'<2>informativa sulla privacy</2> e i <6>termini di servizio</6> di Google.<9></9>Cliccando \"Registra\", accetti il nostro <12>accordo di licenza con l'utente finale (EULA)</12>",
+  "User menu": "Menu utente",
+  "Username": "Nome utente",
+  "Version: {{version}}": "Versione: {{version}}",
+  "Video": "Video",
+  "Waiting for other participants…": "In attesa di altri partecipanti…",
+  "Yes, join call": "Sì, entra in chiamata",
+  "You were disconnected from the call": "Sei stato disconnesso dalla chiamata",
+  "Your feedback": "Il tuo commento",
+  "{{displayName}}, your call has ended.": "{{displayName}}, la chiamata è terminata.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Puoi revocare il consenso deselezionando questa casella. Se attualmente sei in una chiamata, avrà effetto al termine di essa.",
+  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Ti va di terminare impostando una password per mantenere il profilo?</0><1>Potrai mantenere il tuo nome e impostare un avatar da usare in chiamate future</1>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call temporaneamente non è cifrato end-to-end mentre proviamo la scalabilità.",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Se stai riscontrando problemi o semplicemente vuoi dare un'opinione, inviaci una breve descrizione qua sotto.",
+  "Not now, return to home screen": "Non ora, torna alla schermata principale",
+  "Submitting…": "Invio…",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Un altro utente in questa chiamata sta avendo problemi. Per diagnosticare meglio questi problemi, vorremmo raccogliere un registro di debug.",
+  "End-to-end encryption isn't supported on your browser.": "La crittografia end-to-end non è supportata nel tuo browser.",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Cliccando \"Entra in chiamata ora\", accetti il nostro <2>accordo di licenza con l'utente finale (EULA)</2>",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Partecipando a questa beta, acconsenti alla raccolta di dati anonimi che usiamo per migliorare il prodotto. Puoi trovare più informazioni su quali dati monitoriamo nella nostra <2>informativa sulla privacy</2> e nell'<5>informativa sui cookie</5>.",
+  "You": "Tu",
+  "Continue in browser": "Continua nel browser",
+  "Mute microphone": "Spegni il microfono",
+  "Select app": "Seleziona app",
+  "Name of call": "Nome della chiamata",
+  "Open in the app": "Apri nell'app",
+  "Ready to join?": "Tutto pronto per entrare?",
+  "Start video": "Avvia video",
+  "Stop video": "Ferma video",
+  "Unmute microphone": "Riaccendi il microfono",
+  "Back to recents": "Torna ai recenti",
+  "Start new call": "Inizia nuova chiamata",
+  "Call not found": "Chiamata non trovata",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Le chiamate ora sono cifrate end-to-end e devono essere create dalla pagina principale. Ciò assicura che chiunque usi la stessa chiave di crittografia."
+}

public/locales/ja/app.json

@@ -1,72 +1,38 @@
 {
-  "{{name}} (Connecting...)": "{{name}}（接続しています…）",
-  "{{count}} people connected|other": "{{count}}人が接続済",
-  "{{count}} people connected|one": "{{count}}人が接続済",
-  "{{name}} (Waiting for video...)": "{{name}}（ビデオを待機しています…）",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>既にアカウントをお持ちですか？</0><1><0>ログイン</0>または<2>ゲストとしてアクセス</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - トランシーバー通話",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>アカウントを作成</0>または<2>ゲストとしてアクセス</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>今すぐ通話に参加</0><1>または</1><2>通話リンクをコピーし、後で参加</2>",
-  "Accept camera/microphone permissions to join the call.": "通話に参加するには、カメラ・マイクの許可が必要です。",
   "<0>Oops, something's gone wrong.</0>": "<0>何かがうまく行きませんでした。</0>",
-  "Camera/microphone permissions needed to join the call.": "通話に参加する場合、カメラ・マイクの許可が必要です。",
-  "Allow analytics": "アナリティクスを許可",
   "Camera": "カメラ",
-  "Call link copied": "通話リンクをコピーしました",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "「今すぐ通話に参加」をクリックすると、<2>利用規約</2>に同意したとみなされます",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "「続行」をクリックすると、 <2>利用規約</2>に同意したとみなされます",
   "Avatar": "アバター",
-  "Accept microphone permissions to join the call.": "通話に参加するには、マイクの許可が必要です。",
   "Audio": "音声",
-  "Advanced": "高度",
-  "Connection lost": "接続が切断されました",
   "Confirm password": "パスワードを確認",
   "Close": "閉じる",
-  "Change layout": "レイアウトを変更",
   "Copied!": "コピーしました！",
   "Copy and share this call link": "通話リンクをコピーし共有",
   "Copy": "コピー",
-  "Description (optional)": "概要（任意）",
   "Debug log": "デバッグログ",
   "Create account": "アカウントを作成",
-  "Having trouble? Help us fix it.": "問題が起きましたか？修正にご協力ください。",
   "Go": "続行",
-  "Fetching group call timed out.": "グループ通話の取得がタイムアウトしました。",
   "Element Call Home": "Element Call ホーム",
   "Download debug logs": "デバッグログをダウンロード",
   "Display name": "表示名",
   "Developer": "開発者",
-  "Details": "詳細",
   "Full screen": "全画面表示",
   "Exit full screen": "全画面表示を終了",
   "Include debug logs": "デバッグログを含める",
   "Home": "ホーム",
-  "Incompatible versions!": "互換性のないバージョンです！",
-  "Incompatible versions": "互換性のないバージョン",
   "Join existing call?": "既存の通話に参加しますか？",
   "Join call now": "今すぐ通話に参加",
   "Join call": "通話に参加",
-  "Invite": "招待",
-  "Invite people": "連絡先を招待",
   "Not registered yet? <2>Create an account</2>": "アカウントがありませんか？ <2>アカウントを作成</2>",
-  "Mute microphone": "マイクをミュート",
-  "Microphone permissions needed to join the call.": "通話の参加にはマイクの許可が必要です。",
   "Microphone": "マイク",
   "Login": "ログイン",
   "Logging in…": "ログインしています…",
   "Loading…": "読み込んでいます…",
-  "Loading room…": "ルームを読み込んでいます…",
-  "Leave": "退出",
   "Version: {{version}}": "バージョン：{{version}}",
   "Username": "ユーザー名",
   "User menu": "ユーザーメニュー",
-  "User ID": "ユーザーID",
-  "Unmute microphone": "マイクのミュートを解除",
-  "Turn on camera": "カメラをつける",
-  "Turn off camera": "カメラを切る",
-  "Submitting feedback…": "フィードバックを送信しています…",
   "Submit feedback": "フィードバックを送信",
-  "Stop sharing screen": "画面共有を停止",
   "Spotlight": "スポットライト",
   "Send debug logs": "デバッグログを送信",
   "Sign out": "サインアウト",
@@ -75,33 +41,20 @@
   "Settings": "設定",
   "Sending…": "送信しています…",
   "Sending debug logs…": "デバッグログを送信しています…",
-  "Saving…": "保存しています…",
-  "Save": "保存",
   "Return to home screen": "ホーム画面に戻る",
   "Registering…": "登録しています…",
   "Register": "登録",
   "Profile": "プロフィール",
-  "Press and hold spacebar to talk": "スペースを長押しで会話",
   "Passwords must match": "パスワードが一致する必要があります",
   "Password": "パスワード",
   "Speaker": "スピーカー",
-  "Video call name": "ビデオ通話の名称",
-  "Video call": "ビデオ通話",
   "Video": "ビデオ",
   "Waiting for other participants…": "他の参加者を待機しています…",
-  "Waiting for network": "ネットワークを待機しています",
-  "Walkie-talkie call name": "トランシーバー通話の名称",
-  "Walkie-talkie call": "トランシーバー通話",
-  "Camera {{n}}": "カメラ {{n}}",
-  "{{name}} is talking…": "{{name}}が話しています…",
   "Yes, join call": "はい、通話に参加",
-  "Spatial audio": "空間オーディオ",
   "Select an option": "オプションを選択",
   "Debug log request": "デバッグログを要求",
-  "Your recent calls": "最近の通話",
+  "Login to your account": "アカウントにログイン",
-  "You can't talk at the same time": "同時に会話することはできません",
+  "Remove": "削除",
-  "WebRTC is not supported or is being blocked in this browser.": "お使いのブラウザでWebRTCがサポートされていないか、またはブロックされています。",
+  "No": "いいえ",
-  "Login to your account": "お持ちのアカウントでログイン",
+  "This call already exists, would you like to join?": "この通話は既に存在します。参加しますか？"
-  "Freedom": "自由",
-  "{{displayName}}, your call is now ended": "{{displayName}}、通話が終了しました"
 }

public/locales/ko/app.json

@@ -1,11 +1,4 @@
 {
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": ""
-  "{{count}} people connected|one": "{{count}}명 연결됨",
-  "{{count}} people connected|other": "{{count}}명 연결됨",
-  "{{displayName}}, your call is now ended": "{{displayName}}님, 전화가 종료되었습니다",
-  "{{names}}, {{name}}": "{{names}}님, {{name}}님",
-  "{{name}} is presenting": "{{name}}님이 발표 중",
-  "{{name}} is talking…": "{{name}}님이 말하는 중…",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - 워키토키 전화"
 }

public/locales/lv/app.json

@@ -0,0 +1,99 @@
+{
+  "{{count}} stars|one": "{{count}} zvaigzne",
+  "{{count}} stars|other": "{{count}} zvaigznes",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Jau ir konts?</0><1><0>Pieteikties</0> vai <2>Piekļūt kā viesim</2></1>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Izveidot kontu</0> vai <2>Piekļūt kā viesim</2>",
+  "<0>Oops, something's gone wrong.</0>": "<0>Ak vai, kaut kas nogāja greizi!</0>",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Atkļūdošanas žurnāla ierakstu iesūtīšana palīdzēs mums atklāt nepilnību.</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Mums patiktu saņemt Tavu atsauksmi, lai mēs varētu uzlabot Tavu pieredzi.</0>",
+  "<0>Thanks for your feedback!</0>": "<0>Paldies par atsauksmi!</0>",
+  "Audio": "Skaņa",
+  "Avatar": "Attēls",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klikšķināšana uz \"Aiziet\" apliecina piekrišanu mūsu <2>galalietotāja licencēšanas nolīgumam (GLLN)</2>",
+  "Camera": "Kamera",
+  "Close": "Aizvērt",
+  "Confirm password": "Apstiprināt paroli",
+  "Connectivity to the server has been lost.": "Ir zaudēts savienojums ar serveri.",
+  "Copied!": "Ievietots starpliktuvē.",
+  "Copy": "Ievietot starpliktuvē",
+  "Copy and share this call link": "Ievietot starpliktuvē un kopīgot šo zvana saiti",
+  "Create account": "Izveidot kontu",
+  "Debug log": "Atkļūdošanas žurnāls",
+  "Debug log request": "Atkļūdošanas žurnāla pieprasījums",
+  "Developer": "Izstrādātājs",
+  "Developer Settings": "Izstrādātāja iestatījumi",
+  "Display name": "Attēlojamais vārds",
+  "Download debug logs": "Lejupielādēt atkļūdošanas žurnāla ierakstus",
+  "Element Call Home": "Element Call sākums",
+  "Exit full screen": "Iziet no pilnekrāna",
+  "Expose developer settings in the settings window.": "Izstādīt izstrādātāja iestatījumus iestatījumu logā.",
+  "Feedback": "Atsauksmes",
+  "Full screen": "Pilnekrāns",
+  "Go": "Aiziet",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klikšķināšana uz \"Pievienoties zvanam tagad\" apliecina piekrišanu mūsu <2>galalietotāja licencēšanas nolīgumam (GLLN)</2>",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Piedalīšanās šajā beta apliecina piekrišanu anonīmu datu ievākšanai, ko mēs izmantojam, lai uzlabotu izstrādājumu. Vairāk informācijas par datiem, ko mēs ievācam, var atrast mūsu <2>privātuma nosacījumos</2> un <5>sīkdatņu nosacījumos</5>.",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call īslaicīgi nav pilnīgi šifrēts, kamēr mēs pārbaudām mērogojamību.",
+  "Enable end-to-end encryption (password protected calls)": "Iespējot pilnīgu šifrēšanu (ar paroli aizsargāti zvani)",
+  "End-to-end encryption isn't supported on your browser.": "Šajā pārlūkā nav nodrošināta pilnīga šifrēšana.",
+  "{{displayName}} is presenting": "{{displayName}} uzstājas",
+  "{{displayName}}, your call has ended.": "{{displayName}}, Tavs zvans ir beidzies.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Savu piekrišanu var atsaukt ar atzīmes noņemšanu no šīs rūtiņas. Ja pašreiz atrodies zvanā, šis iestatījums stāsies spēkā zvana beigās.",
+  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Kādēļ nepabeigt ar paroles iestatīšanu, lai paturētu savu kontu?</0><1>Būs iespējams paturēt savu vārdu un iestatīt attēlu izmantošanai turpmākajos zvanos</1>",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Citam lietotājam šajā zvanā ir sarežģījumi. Lai labāk atklātu šīs nepilnības, mēs gribētu iegūt atkļūdošanas žurnālu.",
+  "Home": "Sākums",
+  "Waiting for other participants…": "Gaida citus dalībniekus…",
+  "Yes, join call": "Jā, pievienoties zvanam",
+  "Your feedback": "Tava atsauksme",
+  "How did it go?": "Kā Tev veicās?",
+  "Include debug logs": "Iekļaut atkļūdošanas žurnāla ierakstus",
+  "Inspector": "Inspektors",
+  "Join call": "Pievienoties zvanam",
+  "Join call now": "Pievienoties zvanam tagad",
+  "Join existing call?": "Pievienoties esošam zvanam?",
+  "Loading…": "Lādējas…",
+  "Local volume": "Vietējais skaļums",
+  "Logging in…": "Piesakās…",
+  "Login": "Pieteikties",
+  "Login to your account": "Pieteikties kontā",
+  "Microphone": "Mikrofons",
+  "More": "Vairāk",
+  "No": "Nē",
+  "Not now, return to home screen": "Ne tagad, atgriezties sākuma ekrānā",
+  "Password": "Parole",
+  "Passwords must match": "Parolēm ir jāsakrīt",
+  "Profile": "Profils",
+  "Recaptcha dismissed": "ReCaptcha atmesta",
+  "Recaptcha not loaded": "ReCaptcha nav ielādēta",
+  "Reconnect": "Atkārtoti savienoties",
+  "Register": "Reģistrēties",
+  "Registering…": "Reģistrē…",
+  "Remove": "Noņemt",
+  "Retry sending logs": "Atkārtoti mēģināt žurnāla ierakstu nosūtīšanu",
+  "Return to home screen": "Atgriezties sākuma ekrānā",
+  "Select an option": "Atlasīt iespēju",
+  "Send debug logs": "Nosūtīt atkļūdošanas žurnāla ierakstus",
+  "Sending debug logs…": "Nosūta atkļūdošanas žurnāla ierakstus…",
+  "Sending…": "Nosūta…",
+  "Settings": "Iestatījumi",
+  "Share screen": "Kopīgot ekrānu",
+  "Show call inspector": "Rādīt zvanu inspektoru",
+  "Show connection stats": "Rādīt savienojuma apkopojumu",
+  "Sign in": "Pieteikties",
+  "Sign out": "Atteikties",
+  "Speaker": "Runātājs",
+  "Spotlight": "Starmešu gaisma",
+  "Submit": "Iesniegt",
+  "Submit feedback": "Iesniegt atsauksmi",
+  "Submitting…": "Iesniedz…",
+  "Thanks, we received your feedback!": "Paldies, mēs saņēmām atsauksmi!",
+  "Thanks!": "Paldies!",
+  "This call already exists, would you like to join?": "Šis zvans jau pastāv. Vai vēlies pievienoties?",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Šo vietni aizsargā ReCAPTCHA, un ir attiecināmi Google <2>privātuma nosacījumi</2> un <6>pakalpojuma noteikumi</6>.<9></9>Klikšķināšana uz \"Reģistrēties\" sniedz piekrišanu mūsu <12>galalietotāja licencēšanas nolīgumam (GLLN)</12>",
+  "User menu": "Lietotāja izvēlne",
+  "Username": "Lietotājvārds",
+  "Video": "Video",
+  "You were disconnected from the call": "Tu tiki atvienots no zvana",
+  "Version: {{version}}": "Versija: {{version}}",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Ja tiek piedzīvoti sarežģījumi vai vienkārši ir vēlme sniegt kādu atsauksmi, lūgums zemāk nosūtīt mums īsu aprakstu.",
+  "Not registered yet? <2>Create an account</2>": "Vēl neesi reģistrējies? <2>Izveidot kontu</2>"
+}

public/locales/pl/app.json

@@ -1,39 +1,16 @@
 {
-  "More menu": "Menu \"więcej\"",
   "Login": "Zaloguj się",
-  "Go": "Kontynuuj",
+  "Go": "Przejdź",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Klikając \"Kontynuuj\", wyrażasz zgodę na nasze <2>Warunki</2>",
-  "{{count}} people connected|other": "{{count}} ludzi połączono",
-  "Your recent calls": "Twoje ostatnie połączenia",
-  "You can't talk at the same time": "Nie możesz mówić w tym samym czasie",
   "Yes, join call": "Tak, dołącz do połączenia",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC jest niewspierane lub zablokowane w tej przeglądarce.",
-  "Walkie-talkie call name": "Nazwa połączenia walkie-talkie",
-  "Walkie-talkie call": "Połączenie walkie-talkie",
   "Waiting for other participants…": "Oczekiwanie na pozostałych uczestników…",
-  "Waiting for network": "Oczekiwanie na sieć",
-  "Video call name": "Nazwa połączenia wideo",
-  "Video call": "Połączenie wideo",
   "Video": "Wideo",
   "Version: {{version}}": "Wersja: {{version}}",
   "Username": "Nazwa użytkownika",
   "User menu": "Menu użytkownika",
-  "User ID": "ID użytkownika",
-  "Unmute microphone": "Wyłącz wyciszenie mikrofonu",
-  "Turn on camera": "Włącz kamerę",
-  "Turn off camera": "Wyłącz kamerę",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Sprawi to, że dźwięk mówcy będzie zdawał się dochodzić z jego miejsca na ekranie. (Funkcja eksperymentalna: może mieć wpływ na stabilność dźwięku.)",
   "This call already exists, would you like to join?": "Te połączenie już istnieje, czy chcesz do niego dołączyć?",
-  "Thanks! We'll get right on it.": "Dziękujemy! Zaraz się tym zajmiemy.",
-  "Talking…": "Mówienie…",
-  "Take me Home": "Zabierz mnie do ekranu startowego",
-  "Submitting feedback…": "Przesyłanie opinii…",
   "Submit feedback": "Prześlij opinię",
-  "Stop sharing screen": "Zatrzymaj udostępnianie ekranu",
   "Spotlight": "Centrum uwagi",
-  "Speaker {{n}}": "Głośnik {{n}}",
   "Speaker": "Głośnik",
-  "Spatial audio": "Dźwięk przestrzenny",
   "Sign out": "Wyloguj się",
   "Sign in": "Zaloguj się",
   "Show call inspector": "Pokaż inspektora połączenia",
@@ -43,97 +20,92 @@
   "Sending debug logs…": "Wysyłanie dzienników debugowania…",
   "Send debug logs": "Wyślij dzienniki debugowania",
   "Select an option": "Wybierz opcję",
-  "Saving…": "Zapisywanie…",
+  "Return to home screen": "Powróć do strony głównej",
-  "Save": "Zapisz",
-  "Return to home screen": "Powróć do ekranu domowego",
   "Remove": "Usuń",
-  "Release to stop": "Puść przycisk, aby przestać",
-  "Release spacebar key to stop": "Puść spację, aby przestać",
   "Registering…": "Rejestrowanie…",
   "Register": "Zarejestruj",
   "Recaptcha not loaded": "Recaptcha nie została załadowana",
   "Recaptcha dismissed": "Recaptcha odrzucona",
   "Profile": "Profil",
-  "Press and hold to talk over {{name}}": "Przytrzymaj, aby mówić wraz z {{name}}",
+  "Passwords must match": "Hasła muszą pasować",
-  "Press and hold to talk": "Przytrzymaj, aby mówić",
-  "Press and hold spacebar to talk over {{name}}": "Przytrzymaj spację, aby mówić wraz z {{name}}",
-  "Press and hold spacebar to talk": "Przytrzymaj spację, aby mówić",
-  "Passwords must match": "Hasła muszą być identyczne",
   "Password": "Hasło",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Inni użytkownicy próbują dołączyć do tego połączenia przy użyciu niekompatybilnych wersji. Powinni oni upewnić się, że odświeżyli stronę w swoich przeglądarkach:<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "Nie masz konta? <2>Utwórz je</2>",
   "Not now, return to home screen": "Nie teraz, powróć do ekranu domowego",
   "No": "Nie",
-  "Mute microphone": "Wycisz mikrofon",
   "More": "Więcej",
-  "Microphone permissions needed to join the call.": "Aby dołączyć do połączenia, potrzebne są uprawnienia do mikrofonu.",
-  "Microphone {{n}}": "Mikrofon {{n}}",
   "Microphone": "Mikrofon",
   "Login to your account": "Zaloguj się do swojego konta",
   "Logging in…": "Logowanie…",
-  "Local volume": "Lokalna głośność",
+  "Local volume": "Głośność lokalna",
   "Loading…": "Ładowanie…",
-  "Loading room…": "Ładowanie pokoju…",
-  "Leave": "Opuść",
   "Join existing call?": "Dołączyć do istniejącego połączenia?",
   "Join call now": "Dołącz do połączenia teraz",
   "Join call": "Dołącz do połączenia",
-  "Invite people": "Zaproś ludzi",
-  "Invite": "Zaproś",
   "Inspector": "Inspektor",
-  "Incompatible versions!": "Niekompatybilne wersje!",
-  "Incompatible versions": "Niekompatybilne wersje",
   "Include debug logs": "Dołącz dzienniki debugowania",
   "Home": "Strona domowa",
-  "Having trouble? Help us fix it.": "Masz problem? Pomóż nam go naprawić.",
+  "Full screen": "Pełny ekran",
-  "Grid layout menu": "Menu układu siatki",
+  "Exit full screen": "Opuść pełny ekran",
-  "Full screen": "Pełen ekran",
-  "Freedom": "Wolność",
-  "Fetching group call timed out.": "Przekroczono limit czasu na uzyskanie połączenia grupowego.",
-  "Exit full screen": "Zamknij pełny ekran",
   "Download debug logs": "Pobierz dzienniki debugowania",
-  "Display name": "Wyświetlana nazwa",
+  "Display name": "Nazwa wyświetlana",
-  "Developer": "Deweloper",
+  "Developer": "Programista",
-  "Details": "Szczegóły",
-  "Description (optional)": "Opis (opcjonalny)",
   "Debug log request": "Prośba o dzienniki debugowania",
   "Debug log": "Dzienniki debugowania",
   "Create account": "Utwórz konto",
-  "Copy and share this call link": "Skopiuj i podziel się linkiem do połączenia",
+  "Copy and share this call link": "Skopiuj i udostępnij link do rozmowy",
   "Copied!": "Skopiowano!",
-  "Connection lost": "Połączenie utracone",
   "Confirm password": "Potwierdź hasło",
   "Close": "Zamknij",
-  "Change layout": "Zmień układ",
-  "Camera/microphone permissions needed to join the call.": "Aby dołączyć do tego połączenia, potrzebne są uprawnienia do kamery/mikrofonu.",
-  "Camera {{n}}": "Kamera {{n}}",
   "Camera": "Kamera",
-  "Call type menu": "Menu rodzaju połączenia",
-  "Call link copied": "Skopiowano link do połączenia",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Klikając \"Dołącz do rozmowy\", wyrażasz zgodę na nasze <2>Warunki</2>",
   "Avatar": "Awatar",
   "Audio": "Dźwięk",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Inny użytkownik w tym połączeniu napotkał problem. Aby lepiej zdiagnozować tę usterkę, chcielibyśmy zebrać dzienniki debugowania.",
-  "Accept microphone permissions to join the call.": "Przyznaj uprawnienia do mikrofonu aby dołączyć do połączenia.",
-  "Accept camera/microphone permissions to join the call.": "Przyznaj uprawnienia do kamery/mikrofonu aby dołączyć do połączenia.",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Może zechcesz ustawić hasło, aby zachować swoje konto?</0><1>Będziesz w stanie utrzymać swoją nazwę i ustawić awatar do wyświetlania podczas połączeń w przyszłości</1>",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Utwórz konto</0> Albo <2>Dołącz jako gość</2>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Utwórz konto</0> lub <2>Dołącz jako gość</2>",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Masz już konto?</0><1><0>Zaloguj się</0> Albo <2>Dołącz jako gość</2></1>",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Masz już konto?</0><1><0>Zaloguj się</0> lub <2>Dołącz jako gość</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - połączenie walkie-talkie",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{name}} mówi…",
-  "{{name}} is presenting": "{{name}} prezentuje",
-  "{{displayName}}, your call is now ended": "{{displayName}}, twoje połączenie zostało zakończone",
-  "{{count}} people connected|one": "{{count}} osoba połączona",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Czy włączyć skróty klawiszowe pojedynczych klawiszy, np. 'm' aby wyciszyć/załączyć mikrofon.",
-  "This feature is only supported on Firefox.": "Ta funkcjonalność jest dostępna tylko w Firefox.",
-  "Single-key keyboard shortcuts": "Skróty klawiszowe (pojedyncze klawisze)",
   "Copy": "Kopiuj",
-  "Allow analytics": "Zezwól na analitykę",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Wysłanie dzienników debuggowania pomoże nam ustalić przyczynę problemu.</0>",
-  "Advanced": "Zaawansowane",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Wysłanie logów debuggowania pomoże nam ustalić przyczynę problemu.</0>",
   "<0>Oops, something's gone wrong.</0>": "<0>Ojej, coś poszło nie tak.</0>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Dołącz do rozmowy teraz</0><1>Or</1><2>Skopiuj link do rozmowy i dołącz później</2>",
+  "Expose developer settings in the settings window.": "Wyświetl opcje programisty w oknie ustawień.",
-  "{{name}} (Waiting for video...)": "{{name}} (Oczekiwanie na wideo...)",
+  "Element Call Home": "Strona główna Element Call",
-  "{{name}} (Connecting...)": "{{name}} (Łączenie...)"
+  "Developer Settings": "Opcje programisty",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Możesz wycofać swoją zgodę poprzez odznaczenie tego pola. Jeśli już jesteś w trakcie rozmowy, opcja zostanie zastosowana po jej zakończeniu.",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Uczestnicząc w tej becie, upoważniasz nas do zbierania anonimowych danych, które wykorzystamy do ulepszenia produktu. Dowiedz się więcej na temat danych, które zbieramy w naszej <2>Polityce prywatności</2> i <5>Polityce ciasteczek</5>.",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Jeśli posiadasz problemy lub chciałbyś zgłosić swoją opinię, wyślij nam krótki opis.",
+  "Thanks, we received your feedback!": "Dziękujemy, otrzymaliśmy Twoją opinię!",
+  "Feedback": "Opinia użytkownika",
+  "Submitting…": "Wysyłanie…",
+  "Submit": "Wyślij",
+  "Your feedback": "Twoje opinie",
+  "{{count}} stars|other": "{{count}} gwiazdki",
+  "{{count}} stars|one": "{{count}} gwiazdki",
+  "{{displayName}}, your call has ended.": "{{displayName}}, Twoje połączenie zostało zakończone.",
+  "<0>Thanks for your feedback!</0>": "<0>Dziękujemy za Twoją opinię!</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Z przyjemnością wysłuchamy Twojej opinii, aby poprawić Twoje doświadczenia.</0>",
+  "How did it go?": "Jak poszło?",
+  "{{displayName}} is presenting": "{{displayName}} prezentuje",
+  "Show connection stats": "Pokaż statystyki połączenia",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Usługa Element Call tymczasowo nie jest szyfrowana end-to-end w trakcie, gdy testujemy możliwość jej rozszerzenia.",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klikając \"Przejdź\", zgadzasz się na naszą <2>Umowę licencyjną (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Ta witryna jest chroniona przez ReCAPTCHA, więc obowiązują <2>Polityka prywatności</2> i <6>Warunki usług</6> Google. Klikając \"Zarejestruj\", zgadzasz się na naszą <12>Umowę licencyjną (EULA)</12>",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klikając \"Dołącz teraz do rozmowy\", zgadzasz się na naszą <2>Umowę licencyjną (EULA)</2>",
+  "End-to-end encryption isn't supported on your browser.": "Szyfrowanie end-to-end nie jest wspierane przez Twoją przeglądarkę.",
+  "Retry sending logs": "Wyślij logi ponownie",
+  "Thanks!": "Dziękujemy!",
+  "You were disconnected from the call": "Rozłączono Cię z połączenia",
+  "Connectivity to the server has been lost.": "Utracono połączenie z serwerem.",
+  "Reconnect": "Połącz ponownie",
+  "Enable end-to-end encryption (password protected calls)": "Włącz szyfrowanie end-to-end (połączenia chronione hasłem)",
+  "{{count, number}}|other": "{{count, number}}",
+  "Encrypted": "Szyfrowane",
+  "End call": "Zakończ połączenie",
+  "Grid": "Siatka",
+  "Microphone off": "Mikrofon wyłączony",
+  "Microphone on": "Mikrofon włączony",
+  "Not encrypted": "Nie szyfrowane",
+  "Share": "Udostępnij",
+  "Share this call": "Udostępnij to połączenie",
+  "Sharing screen": "Udostępnianie ekranu",
+  "{{count, number}}|one": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}"
 }

public/locales/ru/app.json

@@ -1,54 +1,22 @@
 {
   "Register": "Зарегистрироваться",
-  "Saving…": "Сохранение…",
   "Registering…": "Регистрация…",
   "Logging in…": "Вход…",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
   "Waiting for other participants…": "Ожидание других участников…",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Эта функция балансирует звук к расположению плитки на экране. (Экспериментальная функция: может повлиять на стабильность аудио.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Этот сайт защищён ReCAPTCHA от Google, ознакомьтесь с их <2>Политикой конфиденциальности</2> и <6>Пользовательским соглашением</6>.<9></9>Нажимая \"Зарегистрироваться\", вы также принимаете наши <12>Положения и условия</12>.",
   "This call already exists, would you like to join?": "Этот звонок уже существует, хотите присоединиться?",
-  "Thanks! We'll get right on it.": "Спасибо! Мы учтём ваш отзыв.",
-  "Talking…": "Говорите…",
-  "Submitting feedback…": "Отправка отзыва…",
   "Submit feedback": "Отправить отзыв",
   "Sending debug logs…": "Отправка журнала отладки…",
   "Select an option": "Выберите вариант",
-  "Release to stop": "Отпустите, чтобы прекратить вещание",
-  "Release spacebar key to stop": "Чтобы прекратить вещание, отпустите [Пробел]",
-  "Press and hold to talk over {{name}}": "Зажмите, чтобы говорить поверх участника {{name}}",
-  "Press and hold spacebar to talk over {{name}}": "Чтобы говорить поверх участника {{name}}, нажмите и удерживайте [Пробел]",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Другие пользователи пытаются присоединиться с неподдерживаемых версий программы. Этим участникам надо перезагрузить браузер: <1>{userLis}</1>",
-  "Grid layout menu": "Меню \"Расположение сеткой\"",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Нажимая \"Присоединиться сейчас\", вы соглашаетесь с нашими <2>положениями и условиями</2>",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Нажимая \"Далее\", вы соглашаетесь с нашими <2>положениями и условиями</2>",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Почему бы не задать пароль, тем самым сохранив аккаунт?</0><1>Так вы можете оставить своё имя и задать аватар для будущих звонков.</1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Создать аккаунт</0> или <2>Зайти как гость</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Уже есть аккаунт?</0><1><0>Войти с ним</0> или <2>Зайти как гость</2></1>",
-  "Your recent calls": "Ваши недавние звонки",
-  "You can't talk at the same time": "Вы не можете говорить одновременно",
   "Yes, join call": "Да, присоединиться",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC не поддерживается или заблокирован в этом браузере.",
-  "Walkie-talkie call name": "Название звонка-рации",
-  "Walkie-talkie call": "Звонок-рация",
-  "Waiting for network": "Ожидание сети",
-  "Video call name": "Название видео-звонка",
-  "Video call": "Видео-звонок",
   "Video": "Видео",
   "Version: {{version}}": "Версия: {{version}}",
   "Username": "Имя пользователя",
   "User menu": "Меню пользователя",
-  "User ID": "ID пользователя",
-  "Unmute microphone": "Включить микрофон",
-  "Turn on camera": "Включить камеру",
-  "Turn off camera": "Отключить камеру",
-  "Talk over speaker": "Говорить через динамик",
-  "Take me Home": "Перейти в Начало",
-  "Stop sharing screen": "Остановить показ экрана",
   "Spotlight": "Внимание",
-  "Speaker {{n}}": "Динамик {{n}}",
   "Speaker": "Динамик",
-  "Spatial audio": "Пространственное аудио",
   "Sign out": "Выйти",
   "Sign in": "Войти",
   "Show call inspector": "Показать инспектор",
@@ -56,88 +24,65 @@
   "Settings": "Настройки",
   "Sending…": "Отправка…",
   "Local volume": "Местная громкость",
-  "Call type menu": "Меню \"Тип звонка\"",
-  "More menu": "Полное меню",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Звонок-рация",
   "Include debug logs": "Приложить журнал отладки",
   "Download debug logs": "Скачать журнал отладки",
   "Debug log request": "Запрос журнала отладки",
   "Debug log": "Журнал отладки",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "У одного из участников звонка есть неполадки. Чтобы лучше диагностировать похожие проблемы, нам нужен журнал отладки.",
   "Send debug logs": "Отправить журнал отладки",
-  "Save": "Сохранить",
   "Return to home screen": "Вернуться в Начало",
   "Remove": "Удалить",
   "Recaptcha not loaded": "Невозможно начать проверку",
   "Recaptcha dismissed": "Проверка не пройдена",
   "Profile": "Профиль",
-  "Press and hold to talk": "Зажмите, чтобы говорить",
-  "Press and hold spacebar to talk": "Чтобы говорить, нажмите и удерживайте [Пробел]",
   "Passwords must match": "Пароли должны совпадать",
   "Password": "Пароль",
   "Not registered yet? <2>Create an account</2>": "Ещё не зарегистрированы? <2>Создайте аккаунт</2>",
   "Not now, return to home screen": "Не сейчас, вернуться в Начало",
   "No": "Нет",
-  "Mute microphone": "Отключить микрофон",
   "More": "Больше",
-  "Microphone permissions needed to join the call.": "Нужно разрешение на доступ к микрофону для присоединения к звонку.",
-  "Microphone {{n}}": "Микрофон {{n}}",
   "Microphone": "Микрофон",
   "Login to your account": "Войдите в свой аккаунт",
   "Login": "Вход",
   "Loading…": "Загрузка…",
-  "Loading room…": "Загрузка комнаты…",
-  "Leave": "Покинуть",
   "Join existing call?": "Присоединиться к существующему звонку?",
   "Join call now": "Присоединиться сейчас",
   "Join call": "Присоединиться",
-  "Invite people": "Пригласить участников",
-  "Invite": "Пригласить",
   "Inspector": "Инспектор",
-  "Incompatible versions!": "Несовместимые версии!",
-  "Incompatible versions": "Несовместимые версии",
   "Home": "Начало",
-  "Having trouble? Help us fix it.": "Есть проблема? Помогите нам её устранить.",
   "Go": "Далее",
   "Full screen": "Полноэкранный режим",
-  "Freedom": "Свобода",
-  "Fetching group call timed out.": "Истекло время ожидания для группового звонка.",
   "Exit full screen": "Выйти из полноэкранного режима",
   "Display name": "Видимое имя",
   "Developer": "Разработчику",
-  "Details": "Подробности",
-  "Description (optional)": "Описание (необязательно)",
   "Create account": "Создать аккаунт",
   "Copy and share this call link": "Скопируйте и поделитесь этой ссылкой на звонок",
   "Copied!": "Скопировано!",
-  "Connection lost": "Соединение потеряно",
   "Confirm password": "Подтвердите пароль",
   "Close": "Закрыть",
-  "Change layout": "Изменить расположение",
-  "Camera/microphone permissions needed to join the call.": "Нужны разрешения на доступ к камере/микрофону для присоединения к звонку.",
-  "Camera {{n}}": "Камера {{n}}",
   "Camera": "Камера",
-  "Call link copied": "Ссылка на звонок скопирована",
   "Avatar": "Аватар",
   "Audio": "Аудио",
-  "Accept microphone permissions to join the call.": "Для присоединения к звонку разрешите доступ к микрофону.",
-  "Accept camera/microphone permissions to join the call.": "Для присоединения к звонку разрешите доступ к камере/микрофону.",
-  "{{name}} is talking…": "{{name}} говорит…",
-  "{{name}} is presenting": "{{name}} показывает",
-  "{{displayName}}, your call is now ended": "{{displayName}}, ваш звонок завершён",
-  "{{count}} people connected|other": "{{count}} подключилось",
-  "{{count}} people connected|one": "{{count}} подключился",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Это даст разрешение на отправку анонимизированных данных (таких, как продолжительность звонка и количество участников) команде Element Call, чтобы помочь нам оптимизировать работу приложения на основании того как оно используется.",
   "Element Call Home": "Главная Element Call",
   "Copy": "Копировать",
-  "Allow analytics": "Разрешить аналитику",
-  "Advanced": "Расширенные",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Присоединиться сейчас</0><1>или<1><2>cкопировать ссылку на звонок и присоединиться позже</2>",
-  "{{name}} (Connecting...)": "{{name}} (Соединение...)",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Включить горячие клавиши, например 'm' чтобы отключить/включить микрофон.",
-  "This feature is only supported on Firefox.": "Эта возможность доступна только в Firefox.",
-  "Single-key keyboard shortcuts": "Горячие клавиши",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
   "<0>Oops, something's gone wrong.</0>": "<0>Упс, что-то пошло не так.</0>",
-  "{{name}} (Waiting for video...)": "{{name}} (Ожидание видео...)"
+  "Expose developer settings in the settings window.": "Раскрыть настройки разработчика в окне настроек.",
+  "Developer Settings": "Настройки Разработчика",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Участвуя в этой бета-версии, вы соглашаетесь на сбор анонимных данных, которые мы используем для улучшения продукта. Более подробную информацию о том, какие данные мы отслеживаем, вы можете найти в нашей <2> Политике конфиденциальности</2> и нашей <5> Политике использования файлов cookie</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Вы можете отозвать согласие, сняв этот флажок. Если вы в данный момент находитесь в разговоре, эта настройка вступит в силу по окончании разговора.",
+  "{{displayName}} is presenting": "{{displayName}} представляет",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Мы будем рады видеть ваши отзывы, чтобы мы могли улучшить ваш опыт.</0>",
+  "Thanks, we received your feedback!": "Спасибо. Мы получили ваш отзыв!",
+  "Feedback": "Отзыв",
+  "Submit": "Отправить",
+  "Submitting…": "Отправляем…",
+  "{{count}} stars|one": "{{count}} отмечен",
+  "{{count}} stars|other": "{{count}} отмеченных",
+  "{{displayName}}, your call has ended.": "{{displayName}}, ваш звонок окончен.",
+  "<0>Thanks for your feedback!</0>": "<0>Спасибо за обратную связь!</0>",
+  "Your feedback": "Ваш отзыв",
+  "How did it go?": "Как всё прошло?",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Если у вас возникли проблемы или вы просто хотите оставить отзыв, отправьте нам краткое описание ниже.",
+  "Show connection stats": "Показать статистику соединения"
 }

public/locales/sk/app.json

@@ -2,142 +2,125 @@
   "Spotlight": "Stredobod",
   "Local volume": "Lokálna hlasitosť",
   "Include debug logs": "Zahrnúť záznamy o ladení",
-  "Fetching group call timed out.": "Vypršal čas načítania skupinového volania.",
   "Element Call Home": "Domov Element Call",
-  "You can't talk at the same time": "Nemôžete hovoriť naraz",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Či chcete povoliť jednotlačidlové klávesové skratky, napr. \"m\" na stlmenie/zapnutie mikrofónu.",
   "Waiting for other participants…": "Čaká sa na ďalších účastníkov…",
-  "Waiting for network": "Čakanie na sieť",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Týmto spôsobom sa budú posielať anonymizované údaje (napríklad trvanie hovoru a počet účastníkov) tímu Element Call, aby nám pomohli optimalizovať aplikáciu na základe toho, ako sa používa.",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Zvuk reproduktora tak bude vyzerať, akoby vychádzal z miesta, kde je na obrazovke umiestnená jeho ikona. (Experimentálna funkcia: môže to mať vplyv na stabilitu zvuku.)",
-  "Thanks! We'll get right on it.": "Vďaka! Hneď sa do toho pustíme.",
-  "Talking…": "Rozprávanie…",
-  "Talk over speaker": "Hovor cez reproduktor",
-  "Take me Home": "Zober ma domov",
-  "Submitting feedback…": "Odosielanie spätnej väzby…",
   "Submit feedback": "Odoslať spätnú väzbu",
-  "Stop sharing screen": "Zastaviť zdieľanie obrazovky",
-  "Single-key keyboard shortcuts": "Jednotlačidlové klávesové skratky",
   "Show call inspector": "Zobraziť inšpektora hovorov",
   "Share screen": "Zdieľať obrazovku",
   "Sending…": "Odosielanie…",
   "Sending debug logs…": "Odosielanie záznamov o ladení…",
   "Send debug logs": "Odoslať záznamy o ladení",
   "Select an option": "Vyberte možnosť",
-  "Saving…": "Ukladanie…",
-  "Save": "Uložiť",
   "Return to home screen": "Návrat na domovskú obrazovku",
   "Remove": "Odstrániť",
-  "Release spacebar key to stop": "Pustite medzerník pre ukončenie",
-  "Release to stop": "Pustite pre ukončenie",
   "Registering…": "Registrácia…",
   "Register": "Registrovať sa",
   "Recaptcha not loaded": "Recaptcha sa nenačítala",
   "Recaptcha dismissed": "Recaptcha zamietnutá",
   "Profile": "Profil",
-  "Press and hold to talk over {{name}}": "Stlačte a podržte pre hovor cez {{name}}",
-  "Press and hold to talk": "Stlačte a podržte pre hovor",
-  "Press and hold spacebar to talk over {{name}}": "Stlačte a podržte medzerník, ak chcete hovoriť cez {{name}}",
-  "Press and hold spacebar to talk": "Stlačte a podržte medzerník, ak chcete hovoriť",
   "Passwords must match": "Heslá sa musia zhodovať",
   "Password": "Heslo",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Ostatní používatelia sa pokúšajú pripojiť k tomuto hovoru z nekompatibilných verzií. Títo používatelia by sa mali uistiť, že si obnovili svoje prehliadače:<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "Ešte nie ste zaregistrovaný? <2>Vytvorte si účet</2>",
   "Not now, return to home screen": "Teraz nie, vrátiť sa na domovskú obrazovku",
   "No": "Nie",
-  "Mute microphone": "Stlmiť mikrofón",
-  "More menu": "Ponuka viac",
   "More": "Viac",
-  "Microphone permissions needed to join the call.": "Povolenie mikrofónu je potrebné na pripojenie k hovoru.",
-  "Microphone {{n}}": "Mikrofón {{n}}",
   "Microphone": "Mikrofón",
   "Login to your account": "Prihláste sa do svojho konta",
   "Login": "Prihlásiť sa",
   "Logging in…": "Prihlasovanie…",
   "Loading…": "Načítanie…",
-  "Loading room…": "Načítanie miestnosti…",
-  "Leave": "Opustiť",
   "Join existing call?": "Pripojiť sa k existujúcemu hovoru?",
   "Join call now": "Pripojiť sa k hovoru teraz",
   "Join call": "Pripojiť sa k hovoru",
-  "Invite people": "Pozvať ľudí",
-  "Invite": "Pozvať",
   "Inspector": "Inšpektor",
-  "Incompatible versions!": "Nekompatibilné verzie!",
-  "Incompatible versions": "Nekompatibilné verzie",
   "Home": "Domov",
-  "Having trouble? Help us fix it.": "Máte problém? Pomôžte nám ho opraviť.",
-  "Grid layout menu": "Ponuka rozloženia mriežky",
   "Go": "Prejsť",
   "Full screen": "Zobrazenie na celú obrazovku",
-  "Freedom": "Sloboda",
   "Exit full screen": "Ukončiť zobrazenie na celú obrazovku",
   "Download debug logs": "Stiahnuť záznamy ladenia",
-  "Your recent calls": "Vaše nedávne hovory",
   "Yes, join call": "Áno, pripojiť sa k hovoru",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC nie je podporované alebo je v tomto prehliadači blokované.",
-  "Walkie-talkie call name": "Názov vysielačkového hovoru",
-  "Walkie-talkie call": "Vysielačkový hovor",
-  "Video call name": "Názov video hovoru",
-  "Video call": "Video hovor",
   "Video": "Video",
   "Version: {{version}}": "Verzia: {{version}}",
   "Username": "Meno používateľa",
   "User menu": "Používateľské menu",
-  "User ID": "ID používateľa",
-  "Unmute microphone": "Zrušiť stlmenie mikrofónu",
-  "Turn on camera": "Zapnúť kameru",
-  "Turn off camera": "Vypnúť kameru",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Táto stránka je chránená systémom ReCAPTCHA a platia na ňu <2>Pravidlá ochrany osobných údajov</2> a <6>Podmienky poskytovania služieb</6> spoločnosti Google.<9></9>Kliknutím na tlačidlo \"Registrovať sa\" vyjadrujete súhlas s našimi <12>Podmienkami poskytovania služieb</12>",
   "This call already exists, would you like to join?": "Tento hovor už existuje, chceli by ste sa k nemu pripojiť?",
-  "Speaker {{n}}": "Reproduktor {{n}}",
   "Speaker": "Reproduktor",
-  "Spatial audio": "Priestorový zvuk",
   "Sign out": "Odhlásiť sa",
   "Sign in": "Prihlásiť sa",
   "Settings": "Nastavenia",
   "Display name": "Zobrazované meno",
   "Developer": "Vývojár",
-  "Details": "Podrobnosti",
-  "Description (optional)": "Popis (voliteľné)",
   "Debug log request": "Žiadosť o záznam ladenia",
   "Debug log": "Záznam o ladení",
   "Create account": "Vytvoriť účet",
   "Copy and share this call link": "Skopírovať a zdieľať tento odkaz na hovor",
   "Copy": "Kopírovať",
   "Copied!": "Skopírované!",
-  "Connection lost": "Strata spojenia",
   "Confirm password": "Potvrdiť heslo",
   "Close": "Zatvoriť",
-  "Change layout": "Zmeniť rozloženie",
-  "Camera/microphone permissions needed to join the call.": "Povolenie kamery/mikrofónu je potrebné na pripojenie k hovoru.",
-  "Camera {{n}}": "Kamera {{n}}",
   "Camera": "Kamera",
-  "Call type menu": "Ponuka typu hovoru",
-  "Call link copied": "Odkaz na hovor skopírovaný",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Kliknutím na \"Pripojiť sa k hovoru\" súhlasíte s našimi <2>Podmienkami</2>",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Kliknutím na tlačidlo \"Prejsť\" súhlasíte s našimi <2>Podmienkami</2>",
   "Avatar": "Obrázok",
   "Audio": "Audio",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ďalší používateľ v tomto hovore má problém. Aby sme mohli lepšie diagnostikovať tieto problémy, chceli by sme získať záznam o ladení.",
-  "Allow analytics": "Povoliť analytiku",
-  "Advanced": "Pokročilé",
-  "Accept camera/microphone permissions to join the call.": "Prijmite povolenia kamery/mikrofónu, aby ste sa mohli pripojiť k hovoru.",
-  "Accept microphone permissions to join the call.": "Prijmite povolenia mikrofónu, aby ste sa mohli pripojiť k hovoru.",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Prečo neskončiť nastavením hesla, aby ste si zachovali svoj účet? </0><1>Budete si môcť ponechať svoje meno a nastaviť obrázok, ktorý sa bude používať pri budúcich hovoroch</1>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Pripojiť sa k hovoru teraz</0><1>alebo</1><2>Kopírovať odkaz na hovor a pripojiť sa neskôr</2>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Vytvoriť konto</0> Alebo <2>Prihlásiť sa ako hosť</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Už máte konto?</0><1><0>Prihláste sa</0> Alebo <2>Prihlásiť sa ako hosť</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Vysielačkový hovor",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{name}} rozpráva…",
-  "{{name}} is presenting": "{{name}} prezentuje",
-  "{{name}} (Waiting for video...)": "{{name}} (Čaká sa na video...)",
-  "{{name}} (Connecting...)": "{{name}} (Pripájanie...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}, váš hovor je teraz ukončený",
-  "{{count}} people connected|other": "{{count}} osôb pripojených",
-  "{{count}} people connected|one": "{{count}} osoba pripojená",
-  "This feature is only supported on Firefox.": "Táto funkcia je podporovaná len v prehliadači Firefox.",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Odoslanie záznamov ladenia nám pomôže nájsť problém.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Hups, niečo sa pokazilo.</0>"
+  "<0>Oops, something's gone wrong.</0>": "<0>Hups, niečo sa pokazilo.</0>",
+  "Expose developer settings in the settings window.": "Zobraziť nastavenia pre vývojárov v okne nastavení.",
+  "Developer Settings": "Nastavenia pre vývojárov",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Účasťou v tejto beta verzii súhlasíte so zhromažďovaním anonymných údajov, ktoré použijeme na zlepšenie produktu. Viac informácií o tom, ktoré údaje sledujeme, nájdete v našich <2>Zásadách ochrany osobných údajov</2> a <5>Zásadách používania súborov cookie</5>.",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Súhlas môžete odvolať zrušením označenia tohto políčka. Ak práve prebieha hovor, toto nastavenie nadobudne platnosť po skončení hovoru.",
+  "Your feedback": "Vaša spätná väzba",
+  "Thanks, we received your feedback!": "Ďakujeme, dostali sme vašu spätnú väzbu!",
+  "Submitting…": "Odosielanie…",
+  "Submit": "Odoslať",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Ak máte problémy alebo jednoducho chcete poskytnúť spätnú väzbu, pošlite nám krátky popis nižšie.",
+  "Feedback": "Spätná väzba",
+  "{{count}} stars|one": "{{count}} hviezdička",
+  "How did it go?": "Ako to išlo?",
+  "{{count}} stars|other": "{{count}} hviezdičiek",
+  "{{displayName}}, your call has ended.": "{{displayName}}, váš hovor skončil.",
+  "<0>Thanks for your feedback!</0>": "<0> Ďakujeme za vašu spätnú väzbu!</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0> Radi si vypočujeme vašu spätnú väzbu, aby sme mohli zlepšiť vaše skúsenosti.</0>",
+  "{{displayName}} is presenting": "{{displayName}} prezentuje",
+  "Show connection stats": "Zobraziť štatistiky pripojenia",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Kliknutím na \"Pripojiť sa k hovoru teraz\" súhlasíte s našou <2>Licenčnou zmluvou s koncovým používateľom (EULA)</2>",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Kliknutím na tlačidlo \"Prejsť\" vyjadrujete súhlas s našou <2>Licenčnou zmluvou s koncovým používateľom (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Táto stránka je chránená systémom ReCAPTCHA a platia na ňu <2>Pravidlá ochrany osobných údajov spoločnosti Google</2> a <6>Podmienky poskytovania služieb</6>.<9></9>Kliknutím na tlačidlo \"Registrovať sa\" súhlasíte s našou <12>Licenčnou zmluvou s koncovým používateľom (EULA)</12>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call nie je dočasne šifrovaný, kým testujeme škálovateľnosť.",
+  "Connectivity to the server has been lost.": "Spojenie so serverom sa stratilo.",
+  "Retry sending logs": "Opakovať odoslanie záznamov",
+  "Reconnect": "Znovu pripojiť",
+  "Thanks!": "Ďakujeme!",
+  "You were disconnected from the call": "Boli ste odpojení z hovoru",
+  "Enable end-to-end encryption (password protected calls)": "Povoliť end-to-end šifrovanie (hovory chránené heslom)",
+  "End-to-end encryption isn't supported on your browser.": "End-to-end šifrovanie nie je vo vašom prehliadači podporované.",
+  "{{count, number}}|other": "{{count, number}}",
+  "Encrypted": "Šifrované",
+  "End call": "Ukončiť hovor",
+  "Microphone off": "Mikrofón vypnutý",
+  "Microphone on": "Mikrofón zapnutý",
+  "Grid": "Sieť",
+  "Not encrypted": "Nie je zašifrované",
+  "Share": "Zdieľať",
+  "Sharing screen": "Zdieľanie obrazovky",
+  "{{count, number}}|one": "{{count, number}}",
+  "Share this call": "Zdieľať tento hovor",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "You": "Vy",
+  "Continue in browser": "Pokračovať v prehliadači",
+  "Mute microphone": "Stlmiť mikrofón",
+  "Name of call": "Názov hovoru",
+  "Open in the app": "Otvoriť v aplikácii",
+  "Ready to join?": "Ste pripravení sa pridať?",
+  "Select app": "Vybrať aplikáciu",
+  "Start new call": "Spustiť nový hovor",
+  "Start video": "Spustiť video",
+  "Stop video": "Zastaviť video",
+  "Back to recents": "Späť k nedávnym",
+  "Unmute microphone": "Zrušiť stlmenie mikrofónu",
+  "Call not found": "Hovor nebol nájdený",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Hovory sú teraz end-to-end šifrované a je potrebné ich vytvoriť z domovskej stránky. To pomáha zabezpečiť, aby všetci používali rovnaký šifrovací kľúč.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Váš webový prehliadač nepodporuje end-to-end šifrovanie médií. Podporované prehliadače sú Chrome, Safari, Firefox >=117"
 }

public/locales/sv/app.json

@@ -0,0 +1 @@
+{}

public/locales/tr/app.json

@@ -1,78 +1,46 @@
 {
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Hesabınızı tutmak için niye bir parola açmıyorsunuz?</0><1>Böylece ileriki aramalarda adınızı ve avatarınızı kullanabileceksiniz</1>",
-  "Accept camera/microphone permissions to join the call.": "Aramaya katılmanız için kamera/mikrofon erişimine izin verin.",
-  "Accept microphone permissions to join the call.": "Aramaya katılmak için mikrofon erişim izni verin.",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Bu aramadaki başka bir kullanıcı sorun yaşıyor. Sorunu daha iyi çözebilmemiz için hata ayıklama kütüğünü almak isteriz.",
   "Audio": "Ses",
   "Avatar": "Avatar",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "\"Git\"e tıklayarak,<2>hükümler ve koşullar</2>ı kabul etmiş sayılırsınız",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "\"Şimdi katıl\"a tıklayarak, <2>hükümler ve koşullar</2>ı kabul etmiş sayılırsınız",
-  "Call link copied": "Arama bağlantısı kopyalandı",
-  "Call type menu": "Arama tipi menüsü",
   "Camera": "Kamera",
-  "Camera {{n}}": "{{n}}. kamera",
-  "Camera/microphone permissions needed to join the call.": "Aramaya katılmak için kamera/mikrofon izinleri gerek.",
-  "Change layout": "Yerleşimi değiştir",
   "Close": "Kapat",
   "Confirm password": "Parolayı tekrar edin",
-  "Connection lost": "Bağlantı koptu",
   "Copied!": "Kopyalandı",
   "Copy and share this call link": "Arama bağlantısını kopyala ve paylaş",
   "Create account": "Hesap aç",
   "Debug log": "Hata ayıklama kütüğü",
   "Debug log request": "Hata ayıklama kütük istemi",
-  "Description (optional)": "Tanım (isteğe bağlı)",
-  "Details": "Ayrıntı",
   "Developer": "Geliştirici",
   "Display name": "Ekran adı",
   "Download debug logs": "Hata ayıklama kütüğünü indir",
   "Exit full screen": "Tam ekranı terk et",
-  "Fetching group call timed out.": "Grup çağrısı zaman aşımına uğradı.",
-  "Freedom": "Özgürlük",
   "Full screen": "Tam ekran",
   "Go": "Git",
-  "Grid layout menu": "Izgara plan menü",
-  "Having trouble? Help us fix it.": "Sorun mu var? Çözmemize yardım edin.",
   "Home": "Ev",
   "Include debug logs": "Hata ayıklama kütüğünü dahil et",
-  "Incompatible versions": "Uyumsuz sürümler",
-  "Incompatible versions!": "Sürüm uyumsuz!",
   "Inspector": "Denetçi",
-  "Invite people": "Kişileri davet et",
   "Join call": "Aramaya katıl",
   "Join call now": "Aramaya katıl",
   "Join existing call?": "Mevcut aramaya katıl?",
-  "Leave": "Çık",
-  "Loading room…": "Oda yükleniyor…",
   "Loading…": "Yükleniyor…",
   "Local volume": "Yerel ses seviyesi",
   "Logging in…": "Giriliyor…",
   "Login": "Gir",
   "Login to your account": "Hesabınıza girin",
   "Microphone": "Mikrofon",
-  "Microphone permissions needed to join the call.": "Aramaya katılmak için mikrofon erişim izni gerek.",
-  "Microphone {{n}}": "{{n}}. mikrofon",
   "More": "Daha",
-  "More menu": "Daha fazla",
-  "Mute microphone": "Mikrofonu kapat",
   "No": "Hayır",
   "Not now, return to home screen": "Şimdi değil, ev ekranına dön",
   "Not registered yet? <2>Create an account</2>": "Kaydolmadınız mı? <2>Hesap açın</2>",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Başka kullanıcılar uyumsuz sürümden katılmaya çalışıyorlar. <1>{userLis}</1> tarayıcılarını mutlaka tazelemeliler.",
   "Password": "Parola",
   "Passwords must match": "Parolalar aynı olmalı",
-  "Press and hold spacebar to talk": "Konuşmak için boşluk çubuğunu basılı tutun",
-  "Press and hold to talk": "Konuşmak için basılı tutun",
   "Recaptcha dismissed": "reCAPTCHA atlandı",
   "Recaptcha not loaded": "reCAPTCHA yüklenmedi",
   "Register": "Kaydol",
   "Registering…": "Kaydediyor…",
-  "Release spacebar key to stop": "Kesmek için boşluk tuşunu bırakın",
-  "Release to stop": "Kesmek için bırakın",
   "Remove": "Çıkar",
   "Return to home screen": "Ev ekranına geri dön",
-  "Save": "Kaydet",
-  "Saving…": "Kaydediliyor…",
   "Select an option": "Bir seçenek seç",
   "Send debug logs": "Hata ayıklama kütüğünü gönder",
   "Sending…": "Gönderiliyor…",
@@ -81,20 +49,8 @@
   "Show call inspector": "Arama denetçisini göster",
   "Sign in": "Gir",
   "Sign out": "Çık",
-  "Spatial audio": "Uzamsal ses",
-  "Stop sharing screen": "Ekran paylaşmayı terk et",
   "Submit feedback": "Geri bildirim ver",
-  "Submitting feedback…": "Geri bildirimler gönderiliyor…",
-  "Take me Home": "Ev ekranına gir",
-  "Talking…": "Konuşuyor…",
-  "Thanks! We'll get right on it.": "Sağol! Bununla ilgileneceğiz.",
   "This call already exists, would you like to join?": "Bu arama zaten var, katılmak ister misiniz?",
-  "{{count}} people connected|one": "{{count}} kişi bağlı",
-  "{{count}} people connected|other": "{{count}} kişi bağlı",
-  "{{displayName}}, your call is now ended": "Aramanız bitti, {{displayName]}!",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is presenting": "{{name}} sunuyor",
-  "{{name}} is talking…": "{{name}} konuşuyor…",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Hesap oluştur</0> yahut <2>Konuk olarak gir</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Mevcut hesabınız mı var?</0><1><0>Gir</0> yahut <2>Konuk girişi</2></1>"
 }

public/locales/uk/app.json

@@ -1,143 +1,126 @@
 {
   "Loading…": "Завантаження…",
-  "Your recent calls": "Ваші недавні виклики",
-  "You can't talk at the same time": "Не можна говорити одночасно",
   "Yes, join call": "Так, приєднатися до виклику",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC не підтримується або блокується в цьому браузері.",
-  "Walkie-talkie call name": "Назва виклику-рації",
-  "Walkie-talkie call": "Виклик-рація",
   "Waiting for other participants…": "Очікування на інших учасників…",
-  "Waiting for network": "Очікування мережі",
-  "Video call name": "Назва відеовиклику",
-  "Video call": "Відеовиклик",
   "Video": "Відео",
   "Version: {{version}}": "Версія: {{version}}",
   "Username": "Ім'я користувача",
   "User menu": "Меню користувача",
-  "User ID": "ID користувача",
-  "Unmute microphone": "Увімкнути мікрофон",
-  "Turn on camera": "Увімкнути камеру",
-  "Turn off camera": "Вимкнути камеру",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Це призведе до того, що звук мовця здаватиметься таким, ніби він надходить з того місця, де розміщено його плитку на екрані. (Експериментальна можливість: це може вплинути на стабільність звуку.)",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Цей сайт захищений ReCAPTCHA і до нього застосовується <2>Політика приватності</2> і <6>Умови надання послуг</6> Google.<9></9>Натискаючи кнопку «Зареєструватися», ви погоджуєтеся з нашими <12>Умовами та положеннями</12>",
   "This call already exists, would you like to join?": "Цей виклик уже існує, бажаєте приєднатися?",
-  "Thanks! We'll get right on it.": "Дякуємо! Ми зараз же візьмемося за це.",
-  "Talking…": "Говоріть…",
-  "Talk over speaker": "Говорити через динамік",
-  "Take me Home": "Перейти до Домівки",
-  "Submitting feedback…": "Надсилання відгуку…",
   "Submit feedback": "Надіслати відгук",
-  "Stop sharing screen": "Припинити показ екрана",
   "Spotlight": "У центрі уваги",
-  "Speaker {{n}}": "Динамік {{n}}",
   "Speaker": "Динамік",
-  "Spatial audio": "Просторовий звук",
   "Sign out": "Вийти",
   "Sign in": "Увійти",
   "Show call inspector": "Показати інспектора виклику",
   "Share screen": "Поділитися екраном",
   "Settings": "Налаштування",
   "Sending…": "Надсилання…",
-  "Sending debug logs…": "Надсилання журналу зневадження…",
+  "Sending debug logs…": "Надсилання журналу налагодження…",
-  "Send debug logs": "Надіслати журнал зневадження",
+  "Send debug logs": "Надіслати журнал налагодження",
   "Select an option": "Вибрати опцію",
-  "Saving…": "Збереження…",
-  "Save": "Зберегти",
   "Return to home screen": "Повернутися на екран домівки",
   "Remove": "Вилучити",
-  "Release to stop": "Відпустіть, щоб закінчити",
-  "Release spacebar key to stop": "Відпустіть пробіл, щоб закінчити",
   "Registering…": "Реєстрація…",
   "Register": "Зареєструватися",
   "Recaptcha not loaded": "Recaptcha не завантажено",
   "Recaptcha dismissed": "Recaptcha не пройдено",
   "Profile": "Профіль",
-  "Press and hold to talk over {{name}}": "Затисніть, щоб говорити одночасно з {{name}}",
-  "Press and hold to talk": "Затисніть, щоб говорити",
-  "Press and hold spacebar to talk over {{name}}": "Щоб говорити одночасно з {{name}}, затисніть пробіл",
-  "Press and hold spacebar to talk": "Затисніть пробіл, щоб говорити",
   "Passwords must match": "Паролі відрізняються",
   "Password": "Пароль",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Інші користувачі намагаються приєднатися до цього виклику з несумісних версій. Ці користувачі повинні переконатися, що вони оновили сторінки своїх браузерів:<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "Ще не зареєстровані? <2>Створіть обліковий запис</2>",
   "Not now, return to home screen": "Не зараз, повернутися на екран домівки",
   "No": "Ні",
-  "Mute microphone": "Заглушити мікрофон",
-  "More menu": "Усе меню",
   "More": "Докладніше",
-  "Microphone permissions needed to join the call.": "Для участі у виклику необхідний дозвіл на користування мікрофоном.",
-  "Microphone {{n}}": "Мікрофон {{n}}",
   "Microphone": "Мікрофон",
   "Login to your account": "Увійдіть до свого облікового запису",
   "Login": "Увійти",
   "Logging in…": "Вхід…",
   "Local volume": "Локальна гучність",
-  "Loading room…": "Завантаження кімнати…",
-  "Leave": "Вийти",
   "Join existing call?": "Приєднатися до наявного виклику?",
   "Join call now": "Приєднатися до виклику зараз",
   "Join call": "Приєднатися до виклику",
-  "Invite people": "Запросити людей",
-  "Invite": "Запросити",
   "Inspector": "Інспектор",
-  "Incompatible versions!": "Несумісні версії!",
+  "Include debug logs": "Долучити журнали налагодження",
-  "Incompatible versions": "Несумісні версії",
-  "Include debug logs": "Долучити журнали зневадження",
   "Home": "Домівка",
-  "Having trouble? Help us fix it.": "Проблеми? Допоможіть нам це виправити.",
-  "Grid layout menu": "Меню у вигляді сітки",
   "Go": "Далі",
   "Full screen": "Повноекранний режим",
-  "Freedom": "Свобода",
-  "Fetching group call timed out.": "Вичерпано час очікування групового виклику.",
   "Exit full screen": "Вийти з повноекранного режиму",
-  "Download debug logs": "Завантажити журнали зневадження",
+  "Download debug logs": "Завантажити журнали налагодження",
-  "Display name": "Показуване ім'я",
+  "Display name": "Псевдонім",
   "Developer": "Розробнику",
-  "Details": "Подробиці",
+  "Debug log request": "Запит журналу налагодження",
-  "Description (optional)": "Опис (необов'язково)",
+  "Debug log": "Журнал налагодження",
-  "Debug log request": "Запит журналу зневадження",
-  "Debug log": "Журнал зневадження",
   "Create account": "Створити обліковий запис",
   "Copy and share this call link": "Скопіювати та поділитися цим посиланням на виклик",
   "Copied!": "Скопійовано!",
-  "Connection lost": "З'єднання розірвано",
   "Confirm password": "Підтвердити пароль",
   "Close": "Закрити",
-  "Change layout": "Змінити макет",
-  "Camera/microphone permissions needed to join the call.": "Для приєднання до виклику необхідні дозволи камери/мікрофона.",
-  "Camera {{n}}": "Камера {{n}}",
   "Camera": "Камера",
-  "Call type menu": "Меню типу виклику",
-  "Call link copied": "Посилання на виклик скопійовано",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Натиснувши «Приєднатися до виклику зараз», ви погодитеся з нашими <2>Умовами та положеннями</2>",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Натиснувши «Далі», ви погодитеся з нашими <2>Умовами та положеннями</2>",
   "Avatar": "Аватар",
   "Audio": "Звук",
-  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Інший користувач у цьому виклику має проблему. Щоб краще визначити ці проблеми, ми хотіли б зібрати журнал зневадження.",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Інший користувач у цьому виклику має проблему. Щоб краще визначити ці проблеми, ми хотіли б зібрати журнал налагодження.",
-  "Accept microphone permissions to join the call.": "Надайте дозволи на використання мікрофонів для приєднання до виклику.",
-  "Accept camera/microphone permissions to join the call.": "Надайте дозвіл на використання камери/мікрофона для приєднання до виклику.",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Чому б не завершити, налаштувавши пароль для збереження свого облікового запису?</0><1>Ви зможете зберегти своє ім'я та встановити аватарку для подальшого користування під час майбутніх викликів</1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Створити обліковий запис</0> або <2>Отримати доступ як гість</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Уже маєте обліковий запис?</0><1><0>Увійти</0> Or <2>Отримати доступ як гість</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Виклик-рація",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{name}} балакає…",
-  "{{name}} is presenting": "{{name}} показує",
-  "{{displayName}}, your call is now ended": "{{displayName}}, ваш виклик завершено",
-  "{{count}} people connected|other": "{{count}} під'єдналися",
-  "{{count}} people connected|one": "{{count}} під'єднується",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Приєднатися до виклику зараз</0><1>Or</1><2>Скопіювати посилання на виклик і приєднатися пізніше</2>",
-  "{{name}} (Connecting...)": "{{name}} (З'єднання...)",
-  "Allow analytics": "Дозволити аналітику",
-  "Advanced": "Розширені",
   "Element Call Home": "Домівка Element Call",
   "Copy": "Копіювати",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Це дозволить надсилати анонімні дані (такі як тривалість виклику та кількість учасників) команді Element Call, щоб допомогти нам оптимізувати роботу застосунку на основі того, як він використовується.",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Надсилання журналів налагодження допоможе нам виявити проблему.</0>",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Чи вмикати/вимикати мікрофон однією клавішею, наприклад, «m» для ввімкнення/вимкнення мікрофона.",
+  "<0>Oops, something's gone wrong.</0>": "<0>Йой, щось пішло не за планом.</0>",
-  "Single-key keyboard shortcuts": "Одноклавішні комбінації клавіш",
+  "Expose developer settings in the settings window.": "Відкрийте налаштування розробника у вікні налаштувань.",
-  "{{name}} (Waiting for video...)": "{{name}} (Очікування на відео...)",
+  "Developer Settings": "Налаштування розробника",
-  "This feature is only supported on Firefox.": "Ця функція підтримується лише в браузері Firefox.",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Користуючись дочасним доступом, ви даєте згоду на збір анонімних даних, які ми використовуємо для вдосконалення продукту. Ви можете знайти більше інформації про те, які дані ми відстежуємо в нашій <2>Політиці Приватності</2> і нашій <5>Політиці про куки</5>.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Надсилання журналів зневадження допоможе нам виявити проблему.</0>",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Ви можете відкликати згоду, прибравши цей прапорець. Якщо ви зараз розмовляєте, це налаштування застосується після завершення виклику.",
-  "<0>Oops, something's gone wrong.</0>": "<0>Йой, щось пішло не за планом.</0>"
+  "Your feedback": "Ваш відгук",
+  "Thanks, we received your feedback!": "Дякуємо, ми отримали ваш відгук!",
+  "Submitting…": "Надсилання…",
+  "Submit": "Надіслати",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Якщо у вас виникли проблеми або ви просто хочете залишити відгук, надішліть нам короткий опис нижче.",
+  "Feedback": "Відгук",
+  "<0>Thanks for your feedback!</0>": "<0>Дякуємо за ваш відгук!</0>",
+  "{{count}} stars|one": "{{count}} зірок",
+  "{{count}} stars|other": "{{count}} зірок",
+  "{{displayName}}, your call has ended.": "{{displayName}}, ваш виклик завершено.",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Ми будемо раді почути ваші відгуки, щоб поліпшити роботу застосунку.</0>",
+  "How did it go?": "Вам усе сподобалось?",
+  "{{displayName}} is presenting": "{{displayName}} представляє",
+  "Show connection stats": "Показати стан з'єднання",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Натискаючи \"Далі\", ви погоджуєтеся з нашою <2>Ліцензійною угодою з кінцевим користувачем (EULA)</2>",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Натискаючи \"Приєднатися до виклику зараз\", ви погоджуєтеся з нашою <2>Ліцензійною угодою з кінцевим користувачем (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "Цей сайт захищений ReCAPTCHA і до нього застосовується <2>Політика приватності</2> і <6>Умови надання послуг</6> Google.<9></9>Натискаючи \"Зареєструватися\", ви погоджуєтеся з нашою <12>Ліцензійною угодою з кінцевим користувачем (EULA)</12>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "Виклики Element тимчасово не захищаються наскрізним шифруванням, поки ми тестуємо масштабованість.",
+  "Connectivity to the server has been lost.": "Втрачено зв'язок з сервером.",
+  "Reconnect": "Під'єднати повторно",
+  "Retry sending logs": "Повторити надсилання журналів",
+  "You were disconnected from the call": "Вас від'єднано від виклику",
+  "Thanks!": "Дякуємо!",
+  "Enable end-to-end encryption (password protected calls)": "Увімкнути наскрізне шифрування (захищені паролем виклики)",
+  "End-to-end encryption isn't supported on your browser.": "Наскрізне шифрування не підтримується вашим переглядачем.",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "Encrypted": "Зашифровано",
+  "Microphone on": "Мікрофон увімкнено",
+  "Not encrypted": "Не зашифровано",
+  "Share": "Поділитися",
+  "Sharing screen": "Презентація екрана",
+  "{{count, number}}|one": "{{count, number}}",
+  "End call": "Завершити виклик",
+  "Grid": "Сітка",
+  "Microphone off": "Мікрофон вимкнено",
+  "Share this call": "Поділитися цим викликом",
+  "You": "Ви",
+  "Mute microphone": "Вимкнути мікрофон",
+  "Open in the app": "Відкрити у застосунку",
+  "Ready to join?": "Готові приєднатися?",
+  "Select app": "Вибрати застосунок",
+  "Start video": "Розпочати відео",
+  "Stop video": "Зупинити відео",
+  "Unmute microphone": "Увімкнути мікрофон",
+  "Continue in browser": "Продовжити у браузері",
+  "Name of call": "Назва виклику",
+  "Start new call": "Розпочати новий виклик",
+  "Back to recents": "Повернутися до недавніх",
+  "Call not found": "Виклик не знайдено",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Відтепер виклики захищено наскрізним шифруванням, і їх потрібно створювати з домашньої сторінки. Це допомагає переконатися, що всі користувачі використовують один і той самий ключ шифрування.",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Ваш браузер не підтримує наскрізне шифрування мультимедійних даних. Підтримувані браузери: Chrome, Safari, Firefox >=117"
 }

public/locales/vi/app.json

@@ -0,0 +1,65 @@
+{
+  "Login": "Đăng nhập",
+  "Join call": "Tham gia cuộc gọi",
+  "Password": "Mật khẩu",
+  "Settings": "Cài đặt",
+  "Sending…": "Đang gửi…",
+  "Sign in": "Đăng nhập",
+  "Submit": "Gửi",
+  "Video": "Truyền hình",
+  "Username": "Tên người dùng",
+  "Yes, join call": "Vâng, tham gia cuộc gọi",
+  "Your feedback": "Phản hồi của bạn",
+  "Waiting for other participants…": "Đang đợi những người khác…",
+  "Version: {{version}}": "Phiên bản: {{version}}",
+  "Submit feedback": "Gửi phản hồi",
+  "Speaker": "Loa",
+  "Sign out": "Đăng xuất",
+  "Share screen": "Chia sẻ màn hình",
+  "No": "Không",
+  "Join call now": "Tham gia cuộc gọi",
+  "Create account": "Tạo tài khoản",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Tạo tài khoản</0> Hay <2>Tham gia dưới tên khác</2>",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Gửi nhật ký gỡ lỗi sẽ giúp chúng tôi theo dõi vấn đề.</0>",
+  "Avatar": "Ảnh đại diện",
+  "Audio": "Âm thanh",
+  "Camera": "Máy quay",
+  "Copied!": "Đã sao chép!",
+  "Confirm password": "Xác nhận mật khẩu",
+  "Close": "Đóng",
+  "Debug log": "Nhật ký gỡ lỗi",
+  "Copy": "Sao chép",
+  "Copy and share this call link": "Sao chép và chia sẻ liên kết cuộc gọi này",
+  "Display name": "Tên hiển thị",
+  "Developer Settings": "Cài đặt phát triển",
+  "Developer": "Nhà phát triển",
+  "Download debug logs": "Tải xuống nhật ký gỡ lỗi",
+  "Feedback": "Phản hồi",
+  "Full screen": "Toàn màn hình",
+  "Include debug logs": "Kèm theo nhật ký gỡ lỗi",
+  "Join existing call?": "Tham gia cuộc gọi?",
+  "Loading…": "Đang tải…",
+  "Logging in…": "Đang đăng nhập…",
+  "Login to your account": "Đăng nhập vào tài khoản của bạn",
+  "Microphone": "Micrô",
+  "Not registered yet? <2>Create an account</2>": "Chưa đăng ký? <2>Tạo tài khoản</2>",
+  "Passwords must match": "Mật khẩu phải khớp",
+  "Register": "Đăng ký",
+  "Spotlight": "Tiêu điểm",
+  "Submitting…": "Đang gửi…",
+  "Thanks, we received your feedback!": "Cảm ơn, chúng tôi đã nhận được phản hồi!",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Đã có tài khoản?</0><1><0>Đăng nhập</0> Hay <2>Tham gia dưới tên Khách</2></1>",
+  "Exit full screen": "Rời chế độ toàn màn hình",
+  "Profile": "Hồ sơ",
+  "Registering…": "Đang đăng ký…",
+  "This call already exists, would you like to join?": "Cuộc gọi đã tồn tại, bạn có muốn tham gia không?",
+  "Recaptcha not loaded": "Chưa tải được Recaptcha",
+  "Debug log request": "Yêu cầu nhật ký gỡ lỗi",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Một người dùng khác trong cuộc gọi đang gặp vấn đề. Để có thể chẩn đoán tốt hơn chúng tôi muốn thu thập nhật ký gỡ lỗi.",
+  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Tại sao lại không hoàn thiện bằng cách đặt mật khẩu để giữ tài khoản của bạn?</0><1>Bạn sẽ có thể giữ tên và đặt ảnh đại diện cho những cuộc gọi tiếp theo.</1>",
+  "<0>Oops, something's gone wrong.</0>": "<0>Ối, có cái gì đó sai.</0>",
+  "{{displayName}} is presenting": "{{displayName}} đang trình bày",
+  "{{displayName}}, your call has ended.": "{{displayName}}, cuộc gọi đã kết thúc.",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Chúng tôi muốn nghe phản hồi của bạn để còn cải thiện trải nghiệm cho bạn.</0>",
+  "<0>Thanks for your feedback!</0>": "<0>Cảm hơn vì đã phản hồi!</0>"
+}

public/locales/zh-Hans/app.json

@@ -1,60 +1,21 @@
 {
-  "Your recent calls": "最近通话",
-  "You can't talk at the same time": "你不能在同一时间发言",
   "Yes, join call": "是，加入通话",
-  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "是否启用单键键盘快捷键，例如，'m'可使麦克风静音/取消静音。",
-  "WebRTC is not supported or is being blocked in this browser.": "此浏览器不支持WebRTC或WebRTC被浏览器阻止。",
-  "Walkie-talkie call name": "对讲机通话名称",
-  "Walkie-talkie call": "对讲机通话",
   "Waiting for other participants…": "等待其他参与者……",
-  "Waiting for network": "正在等待网络",
-  "Video call name": "视频通话名称",
-  "Video call": "视频通话",
   "Video": "视频",
   "Version: {{version}}": "版本：{{version}}",
   "Username": "用户名",
   "User menu": "用户菜单",
-  "User ID": "用户ID",
-  "Unmute microphone": "取消麦克风静音",
-  "Turn on camera": "开启摄像头",
-  "Turn off camera": "关闭摄像头",
-  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "这将向Element Call团队发送匿名数据（如通话的持续时间和参与者的数量），以帮助我们根据使用方式优化应用程序。",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "这将使发言人的音频看起来像是来自他们在屏幕上的位置。(实验性功能：这可能影响音频的稳定性）",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "本网站受reCaptcha保护，并适用Google<2>隐私政策</2>和<6>服务条款</6>。<9></9>点击\"注册\"则表明您同意我们的<12>条款和条件</12>",
   "This call already exists, would you like to join?": "该通话已存在，你想加入吗？",
-  "Thanks! We'll get right on it.": "谢谢！我们会马上去做的。",
-  "Talking…": "正在发言……",
-  "Talk over speaker": "通过扬声器发言",
-  "Take me Home": "返回主页",
-  "Submitting feedback…": "正在提交反馈……",
   "Submit feedback": "提交反馈",
-  "Stop sharing screen": "停止屏幕共享",
   "Spotlight": "聚焦模式",
-  "Speaker {{n}}": "发言人 {{n}}",
   "Speaker": "发言人",
-  "Spatial audio": "空间音频",
-  "Single-key keyboard shortcuts": "单键键盘快捷方式",
   "Sign out": "注销登录",
   "Sign in": "登录",
   "Audio": "音频",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "这个通话中的另一个用户出现了问题。为了更好地诊断这些问题，我们想收集调试日志。",
-  "Allow analytics": "允许进行分析",
-  "Advanced": "偏好",
-  "Accept microphone permissions to join the call.": "授予麦克风权限以加入通话。",
-  "Accept camera/microphone permissions to join the call.": "授予摄像头/麦克风权限以加入通话。",
   "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>为什么不设置一个密码来保留你的账户？</0><1>你将可以保留你的名字并设置一个头像，以便在未来的通话中使用。</1>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>现在加入通话</0><1>或</1><2>复制通话链接并稍后加入</2>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>创建账户</0> Or <2>以访客身份继续</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已有账户？</0><1><0>登录</0> Or <2>以访客身份继续</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - 对讲机通话",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{name}}正在发言……",
-  "{{name}} is presenting": "{{name}}正在展示",
-  "{{name}} (Waiting for video...)": "{{name}}（等待视频……）",
-  "{{name}} (Connecting...)": "{{name}} (正在连接……)",
-  "{{displayName}}, your call is now ended": "{{displayName}}，您的通话已结束",
-  "{{count}} people connected|other": "{{count}}人已连接",
-  "{{count}} people connected|one": "{{count}}人已连接",
   "Inspector": "检查器",
   "Show call inspector": "显示通话检查器",
   "Share screen": "屏幕共享",
@@ -63,78 +24,47 @@
   "Sending debug logs…": "正在发送调试日志……",
   "Send debug logs": "发送调试日志",
   "Select an option": "选择一个选项",
-  "Saving…": "正在保存……",
-  "Save": "保存",
   "Return to home screen": "返回主页",
   "Remove": "移除",
-  "Release to stop": "松开后停止",
-  "Release spacebar key to stop": "松开空格键停止",
   "Registering…": "正在注册……",
   "Register": "注册",
   "Recaptcha not loaded": "reCaptcha未加载",
   "Recaptcha dismissed": "reCaptcha验证失败",
   "Profile": "个人信息",
-  "Press and hold to talk over {{name}}": "按住不放即可与 {{name}} 通话",
-  "Press and hold to talk": "按住不放即可通话",
-  "Press and hold spacebar to talk over {{name}}": "按住空格键，与 {{name}} 对话",
-  "Press and hold spacebar to talk": "按住空格键发言",
   "Passwords must match": "密码必须匹配",
   "Password": "密码",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "其他用户正试图从不兼容的版本加入这一呼叫。这些用户应该确保已经刷新了浏览器：<1>{userLis}</1>",
   "Not registered yet? <2>Create an account</2>": "还没有注册？ <2>创建账户<2>",
   "Not now, return to home screen": "暂不，先返回主页",
   "No": "否",
-  "Mute microphone": "麦克风静音",
-  "More menu": "更多",
   "More": "更多",
-  "Microphone permissions needed to join the call.": "加入通话需要麦克风权限。",
-  "Microphone {{n}}": "麦克风 {{n}}",
   "Microphone": "麦克风",
   "Login to your account": "登录你的账户",
   "Login": "登录",
   "Logging in…": "登录中……",
   "Local volume": "本地音量",
   "Loading…": "加载中……",
-  "Loading room…": "加载房间中……",
-  "Leave": "离开",
   "Join existing call?": "加入现有的通话？",
   "Join call now": "现在加入通话",
   "Join call": "加入通话",
-  "Invite people": "邀请他人",
-  "Invite": "邀请",
-  "Incompatible versions!": "版本不兼容！",
-  "Incompatible versions": "不兼容版本",
   "Include debug logs": "包含调试日志",
   "Home": "主页",
-  "Having trouble? Help us fix it.": "遇到麻烦？帮助我们解决问题。",
-  "Grid layout menu": "网格布局菜单",
   "Go": "开始",
   "Full screen": "全屏",
-  "Freedom": "自由模式",
-  "Fetching group call timed out.": "获取群组通话超时。",
   "Exit full screen": "退出全屏",
   "Element Call Home": "Element Call 主页",
   "Download debug logs": "下载调试日志",
   "Display name": "显示名称",
   "Developer": "开发者",
-  "Details": "详情",
-  "Description (optional)": "描述（可选）",
   "Debug log request": "调试日志请求",
   "Debug log": "调试日志",
   "Create account": "创建账户",
   "Copy and share this call link": "复制并分享该链接",
   "Copy": "复制",
   "Copied!": "已复制！",
-  "Connection lost": "连接丢失",
   "Confirm password": "确认密码",
   "Close": "关闭",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "点击开始则代表同意我们的<2>条款和条件<2>",
-  "Change layout": "更改布局",
-  "Camera/microphone permissions needed to join the call.": "加入通话需要摄像头/麦克风权限。",
-  "Camera {{n}}": "摄像头 {{n}}",
   "Camera": "摄像头",
-  "Call type menu": "通话类型菜单",
+  "Avatar": "头像",
-  "Call link copied": "链接已复制",
+  "<0>Oops, something's gone wrong.</0>": "<0>哎哟，出问题了。</0>",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "点击“现在加入”则表示同意我们的<2>条款与条件<2>",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": ""
-  "Avatar": "头像"
 }

public/locales/zh-Hant/app.json

@@ -1,14 +1,126 @@
 {
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>加入通話</0><1>或</1><2>複製通話連結並稍候加入</2>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>建立帳號</0> 或<2>以訪客身份登入</2>",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>建立帳號</0> 或 <2>訪客模式</2>",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已經有帳號?</0><1><0>登入</0> 或<2>以訪客身份登入</2></1>",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已經有帳號了？</0><1><0>登入</0> Or <2>訪客模式登入</2></1>",
+  "Expose developer settings in the settings window.": "在設定視窗中顯示開發者設定。",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - 無線電通話",
+  "Developer Settings": "開發者設定",
-  "{{names}}, {{name}}": "{{names}}，{{name}}",
+  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>送出除錯紀錄，可幫助我們修正問題。</0>",
-  "{{name}} is talking…": "{{name}} 正在交談中…",
+  "<0>Oops, something's gone wrong.</0>": "<0>喔喔，有些地方怪怪的。</0>",
-  "{{name}} is presenting": "{{name}} 正在報告",
+  "Yes, join call": "是，加入對話",
-  "{{name}} (Waiting for video...)": "{{name}} (等待視訊畫面 ...)",
+  "Waiting for other participants…": "等待其他參加者…",
-  "{{name}} (Connecting...)": "{{name}} (連線中 ...)",
+  "Video": "視訊",
-  "{{displayName}}, your call is now ended": "{{displayName}}，您的通話現在已結束",
+  "Version: {{version}}": "版本： {{version}}",
-  "{{count}} people connected|other": "{{count}} 人已連線",
+  "Username": "使用者名稱",
-  "{{count}} people connected|one": "{{count}} 人已連線"
+  "User menu": "使用者選單",
+  "This call already exists, would you like to join?": "通話已經開始，請問您要加入嗎？",
+  "Submit feedback": "遞交回覆",
+  "Spotlight": "聚焦",
+  "Speaker": "發言者",
+  "Sign out": "登出",
+  "Sign in": "登入",
+  "Show call inspector": "顯示通話稽查員",
+  "Share screen": "分享畫面",
+  "Settings": "設定",
+  "Sending…": "傳送中…",
+  "Sending debug logs…": "傳送除錯記錄檔中…",
+  "Send debug logs": "傳送除錯紀錄",
+  "Select an option": "選擇一個選項",
+  "Return to home screen": "回到首頁",
+  "Remove": "移除",
+  "Registering…": "註冊中…",
+  "Register": "註冊",
+  "Recaptcha not loaded": "驗證碼未載入",
+  "Recaptcha dismissed": "略過驗證碼",
+  "Profile": "個人檔案",
+  "Passwords must match": "密碼必須相符",
+  "Password": "密碼",
+  "Not registered yet? <2>Create an account</2>": "還沒註冊嗎？<2>建立帳號</2>",
+  "Not now, return to home screen": "現在不行，回到首頁",
+  "No": "否",
+  "More": "更多",
+  "Microphone": "麥克風",
+  "Login to your account": "登入您的帳號",
+  "Login": "登入",
+  "Logging in…": "登入中…",
+  "Local volume": "您的音量",
+  "Loading…": "載入中…",
+  "Join existing call?": "加入已開始的通話嗎？",
+  "Join call now": "現在加入通話",
+  "Join call": "加入通話",
+  "Inspector": "稽查員",
+  "Include debug logs": "包含除錯紀錄",
+  "Home": "首頁",
+  "Go": "前往",
+  "Full screen": "全螢幕",
+  "Exit full screen": "退出全螢幕",
+  "Element Call Home": "Element Call 首頁",
+  "Download debug logs": "下載偵錯報告",
+  "Display name": "顯示名稱",
+  "Developer": "開發者",
+  "Debug log request": "請求偵錯報告",
+  "Debug log": "除錯紀錄",
+  "Create account": "建立帳號",
+  "Copy and share this call link": "複製並分享通話連結",
+  "Copy": "複製",
+  "Copied!": "已複製！",
+  "Confirm password": "確認密碼",
+  "Close": "關閉",
+  "Camera": "相機",
+  "Avatar": "大頭照",
+  "Audio": "語音",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "這通對話中的另一位使用者遇到了某些問題。為了診斷問題，我們將會建立除錯紀錄。",
+  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>何不設定密碼以保留此帳號？</0><1>您可以保留暱稱並設定頭像，以便未來通話時使用</1>",
+  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "參與此測試版即表示您同意蒐集匿名資料，我們使用這些資料來改進產品。您可以在我們的<2>隱私政策</2>與我們的 <5>Cookie 政策</5> 中找到關於我們追蹤哪些資料的更多資訊。",
+  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>您可以透過取消核取此方塊來撤回同意。若您目前正在通話中，此設定將在通話結束時生效。",
+  "Your feedback": "您的回饋",
+  "Thanks, we received your feedback!": "感謝，我們已經收到您的回饋了！",
+  "Submitting…": "正在遞交……",
+  "Submit": "遞交",
+  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "若您遇到問題或只是想提供一些回饋，請在下方傳送簡短說明給我們。",
+  "Feedback": "回饋",
+  "{{count}} stars|other": "{{count}} 個星星",
+  "<0>Thanks for your feedback!</0>": "<0>感謝您的回饋！</0>",
+  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>我們想要聽到您的回饋，如此我們才能改善您的體驗。</0>",
+  "{{count}} stars|one": "{{count}} 個星星",
+  "{{displayName}}, your call has ended.": "{{displayName}}，您的通話已結束。",
+  "How did it go?": "進展如何？",
+  "{{displayName}} is presenting": "{{displayName}} 正在展示",
+  "Show connection stats": "顯示連線統計資料",
+  "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "點擊「前往」即表示您同意我們的<2>終端使用者授權協議 (EULA)</2>",
+  "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "點擊「立刻加入通話」即表示您同意我們的<2>終端使用者授權協議 (EULA)</2>",
+  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "此網站被 ReCAPTCHA 保護，並適用 Google 的<2>隱私權政策</2>與<6>服務條款</6>。<9></9>點擊「註冊」即表示您同意我們的<12>終端使用者授權協議 (EULA)</12>",
+  "Element Call is temporarily not end-to-end encrypted while we test scalability.": "在我們測試可擴展性時，Element Call 暫時未進行端到端加密。",
+  "Connectivity to the server has been lost.": "到伺服器的連線已遺失。",
+  "Reconnect": "重新連線",
+  "Retry sending logs": "重試傳送紀錄檔",
+  "Thanks!": "感謝！",
+  "You were disconnected from the call": "您已從通話斷線",
+  "Enable end-to-end encryption (password protected calls)": "啟用端到端加密（密碼保護通話）",
+  "End-to-end encryption isn't supported on your browser.": "您的瀏覽器不支援端到端加密。",
+  "{{count, number}}|one": "{{count, number}}",
+  "{{count, number}}|other": "{{count, number}}",
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "Encrypted": "已加密",
+  "End call": "結束通話",
+  "Grid": "網格",
+  "Microphone off": "麥克風關閉",
+  "Microphone on": "麥克風開啟",
+  "Not encrypted": "未加密",
+  "Share": "分享",
+  "Share this call": "分享此通話",
+  "Sharing screen": "分享畫面",
+  "You": "您",
+  "Continue in browser": "在瀏覽器中繼續",
+  "Mute microphone": "將麥克風靜音",
+  "Name of call": "通話名稱",
+  "Open in the app": "在應用程式中開啟",
+  "Ready to join?": "準備好加入了？",
+  "Select app": "選取應用程式",
+  "Start new call": "開始新通話",
+  "Start video": "開始影片",
+  "Back to recents": "回到最近的通話",
+  "Stop video": "停止影片",
+  "Unmute microphone": "將麥克風取消靜音",
+  "Call not found": "找不到通話",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "通話現在是端對端加密的，必須從首頁建立。這有助於確保每個人都使用相同的加密金鑰。",
+  "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "您的網路瀏覽器不支援媒體端到端加密。支援的瀏覽器包含了 Chrome、Safari、Firefox >=117"
 }

renovate.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [
+    {
+      "description": "Disable renoavte for packages we want to monitor ourselves",
+      "matchPackagePatterns": ["matrix-js-sdk"],
+      "enabled": false
+    }
+  ]
+}

scripts/reformat-release-notes.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+# This script can be used to reformat the release notes generated by
+# GitHub releases into a format slightly more appropriate for our
+# project (ie. we don't really need to mention the author of every PR)
+#
+# eg. in: * OpenTelemetry by @dbkr in https://github.com/vector-im/element-call/pull/961
+#    out: * OpenTelemetry (https://github.com/vector-im/element-call/pull/961)
+
+import sys
+import re
+
+for line in sys.stdin:
+    matches = re.match(r'^\* (.*) by (\S+) in (\S+)$', line.strip())
+    print("* %s (%s)" % (matches[1], matches[3]))

src/App.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 New Vector Ltd
+Copyright 2021 - 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,25 +14,51 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { Suspense, useEffect, useState } from "react";
+import { Suspense, useEffect, useState } from "react";
-import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  useLocation,
+} from "react-router-dom";
 import * as Sentry from "@sentry/react";
 import { OverlayProvider } from "@react-aria/overlays";
+import { History } from "history";
 
 import { HomePage } from "./home/HomePage";
 import { LoginPage } from "./auth/LoginPage";
 import { RegisterPage } from "./auth/RegisterPage";
 import { RoomPage } from "./room/RoomPage";
-import { RoomRedirect } from "./room/RoomRedirect";
 import { ClientProvider } from "./ClientContext";
-import { usePageFocusStyle } from "./usePageFocusStyle";
 import { SequenceDiagramViewerPage } from "./SequenceDiagramViewerPage";
 import { InspectorContextProvider } from "./room/GroupCallInspector";
 import { CrashView, LoadingView } from "./FullScreenView";
+import { DisconnectedBanner } from "./DisconnectedBanner";
 import { Initializer } from "./initializer";
+import { MediaDevicesProvider } from "./livekit/MediaDevicesContext";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
+interface BackgroundProviderProps {
+  children: JSX.Element;
+}
+
+const BackgroundProvider = ({ children }: BackgroundProviderProps) => {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    let backgroundImage = "";
+    if (!["/login", "/register"].includes(pathname)) {
+      backgroundImage = "var(--background-gradient)";
+    }
+
+    document.getElementsByTagName("body")[0].style.backgroundImage =
+      backgroundImage;
+  }, [pathname]);
+
+  return <>{children}</>;
+};
+
 interface AppProps {
   history: History;
 }
@@ -46,18 +72,21 @@ export default function App({ history }: AppProps) {
     });
   });
 
-  usePageFocusStyle();
-
   const errorPage = <CrashView />;
 
   return (
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     <Router history={history}>
+      <BackgroundProvider>
         {loaded ? (
           <Suspense fallback={null}>
             <ClientProvider>
+              <MediaDevicesProvider>
                 <InspectorContextProvider>
                   <Sentry.ErrorBoundary fallback={errorPage}>
                     <OverlayProvider>
+                      <DisconnectedBanner />
                       <Switch>
                         <SentryRoute exact path="/">
                           <HomePage />
@@ -68,24 +97,23 @@ export default function App({ history }: AppProps) {
                         <SentryRoute exact path="/register">
                           <RegisterPage />
                         </SentryRoute>
-                    <SentryRoute path="/room/:roomId?">
-                      <RoomPage />
-                    </SentryRoute>
                         <SentryRoute path="/inspector">
                           <SequenceDiagramViewerPage />
                         </SentryRoute>
                         <SentryRoute path="*">
-                      <RoomRedirect />
+                          <RoomPage />
                         </SentryRoute>
                       </Switch>
                     </OverlayProvider>
                   </Sentry.ErrorBoundary>
                 </InspectorContextProvider>
+              </MediaDevicesProvider>
             </ClientProvider>
           </Suspense>
         ) : (
           <LoadingView />
         )}
+      </BackgroundProvider>
     </Router>
   );
 }

src/Avatar.module.css

@@ -1,76 +0,0 @@
-/*
-Copyright 2022 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.avatar {
-  position: relative;
-  color: var(--primary-content);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  pointer-events: none;
-  font-weight: 600;
-  overflow: hidden;
-  flex-shrink: 0;
-}
-
-.avatar img {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-
-.avatar svg * {
-  fill: var(--primary-content);
-}
-
-.avatar span {
-  padding-top: 1px;
-}
-
-.xs {
-  width: 22px;
-  height: 22px;
-  border-radius: 22px;
-  font-size: 14px;
-}
-
-.sm {
-  width: 32px;
-  height: 32px;
-  border-radius: 32px;
-  font-size: 15px;
-}
-
-.md {
-  width: 36px;
-  height: 36px;
-  border-radius: 36px;
-  font-size: 20px;
-}
-
-.lg {
-  width: 42px;
-  height: 42px;
-  border-radius: 42px;
-  font-size: 24px;
-}
-
-.xl {
-  width: 90px;
-  height: 90px;
-  border-radius: 90px;
-  font-size: 48px;
-}

src/Avatar.tsx

@@ -14,24 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useMemo, CSSProperties } from "react";
+import { useMemo, FC } from "react";
-import classNames from "classnames";
+import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
-import { MatrixClient } from "matrix-js-sdk/src/client";
 
 import { getAvatarUrl } from "./matrix-utils";
 import { useClient } from "./ClientContext";
-import styles from "./Avatar.module.css";
-
-const backgroundColors = [
-  "#5C56F5",
-  "#03B381",
-  "#368BD6",
-  "#AC3BA8",
-  "#E64F7A",
-  "#FF812D",
-  "#2DC2C5",
-  "#74D12C",
-];
 
 export enum Size {
   XS = "xs",
@@ -49,83 +36,43 @@ export const sizes = new Map([
   [Size.XL, 90],
 ]);
 
-function hashStringToArrIndex(str: string, arrLength: number) {
+interface Props {
-  let sum = 0;
+  id: string;
-
+  name: string;
-  for (let i = 0; i < str.length; i++) {
+  className?: string;
-    sum += str.charCodeAt(i);
-  }
-
-  return sum % arrLength;
-}
-
-const resolveAvatarSrc = (client: MatrixClient, src: string, size: number) =>
-  src?.startsWith("mxc://") ? client && getAvatarUrl(client, src, size) : src;
-
-interface Props extends React.HTMLAttributes<HTMLDivElement> {
-  bgKey?: string;
   src?: string;
   size?: Size | number;
-  className?: string;
-  style?: CSSProperties;
-  fallback: string;
 }
 
-export const Avatar: React.FC<Props> = ({
+export const Avatar: FC<Props> = ({
-  bgKey,
-  src,
-  fallback,
-  size = Size.MD,
   className,
-  style = {},
+  id,
-  ...rest
+  name,
+  src,
+  size = Size.MD,
 }) => {
   const { client } = useClient();
 
-  const [sizeClass, sizePx, sizeStyle] = useMemo(
+  const sizePx = useMemo(
     () =>
       Object.values(Size).includes(size as Size)
-        ? [styles[size as string], sizes.get(size as Size), {}]
+        ? sizes.get(size as Size)
-        : [
+        : (size as number),
-            null,
-            size as number,
-            {
-              width: size,
-              height: size,
-              borderRadius: size,
-              fontSize: Math.round((size as number) / 2),
-            },
-          ],
     [size]
   );
 
-  const resolvedSrc = useMemo(
+  const resolvedSrc = useMemo(() => {
-    () => resolveAvatarSrc(client, src, sizePx),
+    if (!client || !src || !sizePx) return undefined;
-    [client, src, sizePx]
+    return src.startsWith("mxc://") ? getAvatarUrl(client, src, sizePx) : src;
-  );
+  }, [client, src, sizePx]);
 
-  const backgroundColor = useMemo(() => {
-    const index = hashStringToArrIndex(
-      bgKey || fallback || src || "",
-      backgroundColors.length
-    );
-    return backgroundColors[index];
-  }, [bgKey, src, fallback]);
-
-  /* eslint-disable jsx-a11y/alt-text */
   return (
-    <div
+    <CompoundAvatar
-      className={classNames(styles.avatar, sizeClass, className)}
+      className={className}
-      style={{ backgroundColor, ...sizeStyle, ...style }}
+      id={id}
-      {...rest}
+      name={name}
-    >
+      size={`${sizePx}px`}
-      {resolvedSrc ? (
+      src={resolvedSrc}
-        <img src={resolvedSrc} />
+    />
-      ) : typeof fallback === "string" ? (
-        <span>{fallback}</span>
-      ) : (
-        fallback
-      )}
-    </div>
   );
 };

src/Banner.module.css

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.pttClip {
+.banner {
-  display: none;
+  flex: 1;
+  border-radius: 8px;
+  padding: 16px;
+  background-color: var(--cpd-color-bg-subtle-primary);
 }

src/Banner.tsx

@@ -0,0 +1,27 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ReactNode } from "react";
+
+import styles from "./Banner.module.css";
+
+interface Props {
+  children: ReactNode;
+}
+
+export const Banner = ({ children }: Props) => {
+  return <div className={styles.banner}>{children}</div>;
+};

src/ClientContext.tsx

@@ -14,26 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {
+import {
   FC,
   useCallback,
   useEffect,
   useState,
   createContext,
-  useMemo,
   useContext,
   useRef,
+  useMemo,
 } from "react";
 import { useHistory } from "react-router-dom";
-import { MatrixClient } from "matrix-js-sdk/src/client";
+import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
 import { useTranslation } from "react-i18next";
+import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync";
 
 import { ErrorView } from "./FullScreenView";
 import {
-  initClient,
   CryptoStoreIntegrityError,
   fallbackICEServerAllowed,
+  initClient,
 } from "./matrix-utils";
 import { widget } from "./widget";
 import {
@@ -47,129 +48,344 @@ import { Config } from "./config/Config";
 declare global {
   interface Window {
     matrixclient: MatrixClient;
-    isPasswordlessUser: boolean;
+    passwordlessUser: boolean;
   }
 }
 
-export interface Session {
+export type ClientState = ValidClientState | ErrorState;
-  user_id: string;
+
-  device_id: string;
+export type ValidClientState = {
-  access_token: string;
+  state: "valid";
+  authenticated?: AuthenticatedClient;
+  // 'Disconnected' rather than 'connected' because it tracks specifically
+  // whether the client is supposed to be connected but is not
+  disconnected: boolean;
+  setClient: (params?: SetClientParams) => void;
+};
+
+export type AuthenticatedClient = {
+  client: MatrixClient;
+  isPasswordlessUser: boolean;
+  changePassword: (password: string) => Promise<void>;
+  logout: () => void;
+};
+
+export type ErrorState = {
+  state: "error";
+  error: Error;
+};
+
+export type SetClientParams = {
+  client: MatrixClient;
+  session: Session;
+};
+
+const ClientContext = createContext<ClientState | undefined>(undefined);
+
+export const useClientState = () => useContext(ClientContext);
+
+export function useClient(): {
+  client?: MatrixClient;
+  setClient?: (params?: SetClientParams) => void;
+} {
+  let client;
+  let setClient;
+
+  const clientState = useClientState();
+  if (clientState?.state === "valid") {
+    client = clientState.authenticated?.client;
+    setClient = clientState.setClient;
+  }
+
+  return { client, setClient };
+}
+
+// Plain representation of the `ClientContext` as a helper for old components that expected an object with multiple fields.
+export function useClientLegacy(): {
+  client?: MatrixClient;
+  setClient?: (params?: SetClientParams) => void;
   passwordlessUser: boolean;
-  tempPassword?: string;
+  loading: boolean;
+  authenticated: boolean;
+  logout?: () => void;
+  error?: Error;
+} {
+  const clientState = useClientState();
+
+  let client;
+  let setClient;
+  let passwordlessUser = false;
+  let loading = true;
+  let error;
+  let authenticated = false;
+  let logout;
+
+  if (clientState?.state === "valid") {
+    client = clientState.authenticated?.client;
+    setClient = clientState.setClient;
+    passwordlessUser = clientState.authenticated?.isPasswordlessUser ?? false;
+    loading = false;
+    authenticated = client !== undefined;
+    logout = clientState.authenticated?.logout;
+  } else if (clientState?.state === "error") {
+    error = clientState.error;
+    loading = false;
+  }
+
+  return {
+    client,
+    setClient,
+    passwordlessUser,
+    loading,
+    authenticated,
+    logout,
+    error,
+  };
 }
 
 const loadChannel =
   "BroadcastChannel" in window ? new BroadcastChannel("load") : null;
 
-const loadSession = (): Session => {
-  const data = localStorage.getItem("matrix-auth-store");
-  if (data) return JSON.parse(data);
-  return null;
-};
-const saveSession = (session: Session) =>
-  localStorage.setItem("matrix-auth-store", JSON.stringify(session));
-const clearSession = () => localStorage.removeItem("matrix-auth-store");
-
-interface ClientState {
-  loading: boolean;
-  isAuthenticated: boolean;
-  isPasswordlessUser: boolean;
-  client: MatrixClient;
-  userName: string;
-  changePassword: (password: string) => Promise<void>;
-  logout: () => void;
-  setClient: (client: MatrixClient, session: Session) => void;
-  error?: Error;
-}
-
-const ClientContext = createContext<ClientState>(null);
-
-type ClientProviderState = Omit<
-  ClientState,
-  "changePassword" | "logout" | "setClient"
-> & { error?: Error };
-
 interface Props {
   children: JSX.Element;
 }
 
 export const ClientProvider: FC<Props> = ({ children }) => {
   const history = useHistory();
-  const initializing = useRef(false);
-  const [
-    { loading, isAuthenticated, isPasswordlessUser, client, userName, error },
-    setState,
-  ] = useState<ClientProviderState>({
-    loading: true,
-    isAuthenticated: false,
-    isPasswordlessUser: false,
-    client: undefined,
-    userName: null,
-    error: undefined,
-  });
 
+  // null = signed out, undefined = loading
+  const [initClientState, setInitClientState] = useState<
+    InitResult | null | undefined
+  >(undefined);
+
+  const initializing = useRef(false);
   useEffect(() => {
     // In case the component is mounted, unmounted, and remounted quickly (as
     // React does in strict mode), we need to make sure not to doubly initialize
-    // the client
+    // the client.
     if (initializing.current) return;
     initializing.current = true;
 
-    const init = async (): Promise<
+    loadClient()
-      Pick<ClientProviderState, "client" | "isPasswordlessUser">
+      .then(setInitClientState)
-    > => {
+      .catch((err) => logger.error(err))
+      .finally(() => (initializing.current = false));
+  }, []);
+
+  const changePassword = useCallback(
+    async (password: string) => {
+      const session = loadSession();
+      if (!initClientState?.client || !session) {
+        return;
+      }
+
+      await initClientState.client.setPassword(
+        {
+          type: "m.login.password",
+          identifier: {
+            type: "m.id.user",
+            user: session.user_id,
+          },
+          user: session.user_id,
+          password: session.tempPassword,
+        },
+        password
+      );
+
+      saveSession({ ...session, passwordlessUser: false });
+
+      setInitClientState({
+        client: initClientState.client,
+        passwordlessUser: false,
+      });
+    },
+    [initClientState?.client]
+  );
+
+  const setClient = useCallback(
+    (clientParams?: SetClientParams) => {
+      const oldClient = initClientState?.client;
+      const newClient = clientParams?.client;
+      if (oldClient && oldClient !== newClient) {
+        oldClient.stopClient();
+      }
+
+      if (clientParams) {
+        saveSession(clientParams.session);
+        setInitClientState({
+          client: clientParams.client,
+          passwordlessUser: clientParams.session.passwordlessUser,
+        });
+      } else {
+        clearSession();
+        setInitClientState(null);
+      }
+    },
+    [initClientState?.client]
+  );
+
+  const logout = useCallback(async () => {
+    const client = initClientState?.client;
+    if (!client) {
+      return;
+    }
+
+    await client.logout(true);
+    await client.clearStores();
+    clearSession();
+    setInitClientState(null);
+    history.push("/");
+    PosthogAnalytics.instance.setRegistrationType(RegistrationType.Guest);
+  }, [history, initClientState?.client]);
+
+  const { t } = useTranslation();
+
+  // To protect against multiple sessions writing to the same storage
+  // simultaneously, we send a broadcast message that shuts down all other
+  // running instances of the app. This isn't necessary if the app is running in
+  // a widget though, since then it'll be mostly stateless.
+  useEffect(() => {
+    if (!widget) loadChannel?.postMessage({});
+  }, []);
+
+  const [alreadyOpenedErr, setAlreadyOpenedErr] = useState<Error | undefined>(
+    undefined
+  );
+  useEventTarget(
+    loadChannel,
+    "message",
+    useCallback(() => {
+      initClientState?.client.stopClient();
+      setAlreadyOpenedErr(
+        translatedError("This application has been opened in another tab.", t)
+      );
+    }, [initClientState?.client, setAlreadyOpenedErr, t])
+  );
+
+  const [isDisconnected, setIsDisconnected] = useState(false);
+
+  const state: ClientState | undefined = useMemo(() => {
+    if (alreadyOpenedErr) {
+      return { state: "error", error: alreadyOpenedErr };
+    }
+
+    if (initClientState === undefined) return undefined;
+
+    const authenticated =
+      initClientState === null
+        ? undefined
+        : {
+            client: initClientState.client,
+            isPasswordlessUser: initClientState.passwordlessUser,
+            changePassword,
+            logout,
+          };
+
+    return {
+      state: "valid",
+      authenticated,
+      setClient,
+      disconnected: isDisconnected,
+    };
+  }, [
+    alreadyOpenedErr,
+    changePassword,
+    initClientState,
+    logout,
+    setClient,
+    isDisconnected,
+  ]);
+
+  const onSync = useCallback(
+    (state: SyncState, _old: SyncState | null, data?: ISyncStateData) => {
+      setIsDisconnected(clientIsDisconnected(state, data));
+    },
+    []
+  );
+
+  useEffect(() => {
+    if (!initClientState) {
+      return;
+    }
+
+    window.matrixclient = initClientState.client;
+    window.passwordlessUser = initClientState.passwordlessUser;
+
+    if (PosthogAnalytics.hasInstance())
+      PosthogAnalytics.instance.onLoginStatusChanged();
+
+    if (initClientState.client) {
+      initClientState.client.on(ClientEvent.Sync, onSync);
+    }
+
+    return () => {
+      if (initClientState.client) {
+        initClientState.client.removeListener(ClientEvent.Sync, onSync);
+      }
+    };
+  }, [initClientState, onSync]);
+
+  if (alreadyOpenedErr) {
+    return <ErrorView error={alreadyOpenedErr} />;
+  }
+
+  return (
+    <ClientContext.Provider value={state}>{children}</ClientContext.Provider>
+  );
+};
+
+type InitResult = {
+  client: MatrixClient;
+  passwordlessUser: boolean;
+};
+
+async function loadClient(): Promise<InitResult | null> {
   if (widget) {
     // We're inside a widget, so let's engage *matryoshka mode*
     logger.log("Using a matryoshka client");
+    const client = await widget.client;
     return {
-          client: await widget.client,
+      client,
-          isPasswordlessUser: false,
+      passwordlessUser: false,
     };
   } else {
     // We're running as a standalone application
     try {
       const session = loadSession();
-          if (!session) return { client: undefined, isPasswordlessUser: false };
+      if (!session) {
+        logger.log("No session stored; continuing without a client");
+        return null;
+      }
 
       logger.log("Using a standalone client");
 
       /* eslint-disable camelcase */
-          const { user_id, device_id, access_token, passwordlessUser } =
+      const { user_id, device_id, access_token, passwordlessUser } = session;
-            session;
+      const initClientParams = {
-
+        baseUrl: Config.defaultHomeserverUrl()!,
-          try {
-            return {
-              client: await initClient(
-                {
-                  baseUrl: Config.defaultHomeserverUrl(),
         accessToken: access_token,
         userId: user_id,
         deviceId: device_id,
         fallbackICEServerAllowed: fallbackICEServerAllowed,
-                },
+        livekitServiceURL: Config.get().livekit!.livekit_service_url,
-                true
+      };
-              ),
+
-              isPasswordlessUser: passwordlessUser,
+      try {
+        const client = await initClient(initClientParams, true);
+        return {
+          client,
+          passwordlessUser,
         };
       } catch (err) {
         if (err instanceof CryptoStoreIntegrityError) {
           // We can't use this session anymore, so let's log it out
           try {
-                const client = await initClient(
+            const client = await initClient(initClientParams, false); // Don't need the crypto store just to log out)
-                  {
-                    baseUrl: Config.defaultHomeserverUrl(),
-                    accessToken: access_token,
-                    userId: user_id,
-                    deviceId: device_id,
-                    fallbackICEServerAllowed: fallbackICEServerAllowed,
-                  },
-                  false // Don't need the crypto store just to log out
-                );
             await client.logout(true);
-              } catch (err_) {
+          } catch (err) {
             logger.warn(
               "The previous session was lost, and we couldn't log it out, " +
+                err +
                 "either"
             );
           }
@@ -182,175 +398,29 @@ export const ClientProvider: FC<Props> = ({ children }) => {
       throw err;
     }
   }
-    };
+}
 
-    init()
+export interface Session {
-      .then(({ client, isPasswordlessUser }) => {
+  user_id: string;
-        setState({
+  device_id: string;
-          client,
+  access_token: string;
-          loading: false,
+  passwordlessUser: boolean;
-          isAuthenticated: Boolean(client),
+  tempPassword?: string;
-          isPasswordlessUser,
+}
-          userName: client?.getUserIdLocalpart(),
-          error: undefined,
-        });
-      })
-      .catch((err) => {
-        logger.error(err);
-        setState({
-          client: undefined,
-          loading: false,
-          isAuthenticated: false,
-          isPasswordlessUser: false,
-          userName: null,
-          error: undefined,
-        });
-      })
-      .finally(() => (initializing.current = false));
-  }, []);
 
-  const changePassword = useCallback(
+const clearSession = () => localStorage.removeItem("matrix-auth-store");
-    async (password: string) => {
+const saveSession = (s: Session) =>
-      const { tempPassword, ...session } = loadSession();
+  localStorage.setItem("matrix-auth-store", JSON.stringify(s));
-
+const loadSession = (): Session | undefined => {
-      await client.setPassword(
+  const data = localStorage.getItem("matrix-auth-store");
-        {
+  if (!data) {
-          type: "m.login.password",
+    return undefined;
-          identifier: {
-            type: "m.id.user",
-            user: session.user_id,
-          },
-          user: session.user_id,
-          password: tempPassword,
-        },
-        password
-      );
-
-      saveSession({ ...session, passwordlessUser: false });
-
-      setState({
-        client,
-        loading: false,
-        isAuthenticated: true,
-        isPasswordlessUser: false,
-        userName: client.getUserIdLocalpart(),
-        error: undefined,
-      });
-    },
-    [client]
-  );
-
-  const setClient = useCallback(
-    (newClient: MatrixClient, session: Session) => {
-      if (client && client !== newClient) {
-        client.stopClient();
   }
 
-      if (newClient) {
+  return JSON.parse(data);
-        saveSession(session);
-
-        setState({
-          client: newClient,
-          loading: false,
-          isAuthenticated: true,
-          isPasswordlessUser: session.passwordlessUser,
-          userName: newClient.getUserIdLocalpart(),
-          error: undefined,
-        });
-      } else {
-        clearSession();
-
-        setState({
-          client: undefined,
-          loading: false,
-          isAuthenticated: false,
-          isPasswordlessUser: false,
-          userName: null,
-          error: undefined,
-        });
-      }
-    },
-    [client]
-  );
-
-  const logout = useCallback(async () => {
-    await client.logout(true);
-    await client.clearStores();
-    clearSession();
-    setState({
-      client: undefined,
-      loading: false,
-      isAuthenticated: false,
-      isPasswordlessUser: true,
-      userName: "",
-      error: undefined,
-    });
-    history.push("/");
-    PosthogAnalytics.instance.setRegistrationType(RegistrationType.Guest);
-  }, [history, client]);
-
-  const { t } = useTranslation();
-
-  // To protect against multiple sessions writing to the same storage
-  // simultaneously, we send a broadcast message that shuts down all other
-  // running instances of the app. This isn't necessary if the app is running in
-  // a widget though, since then it'll be mostly stateless.
-  useEffect(() => {
-    if (!widget) loadChannel?.postMessage({});
-  }, []);
-
-  useEventTarget(
-    loadChannel,
-    "message",
-    useCallback(() => {
-      client?.stopClient();
-
-      setState((prev) => ({
-        ...prev,
-        error: translatedError(
-          "This application has been opened in another tab.",
-          t
-        ),
-      }));
-    }, [client, setState, t])
-  );
-
-  const context = useMemo<ClientState>(
-    () => ({
-      loading,
-      isAuthenticated,
-      isPasswordlessUser,
-      client,
-      changePassword,
-      logout,
-      userName,
-      setClient,
-      error: undefined,
-    }),
-    [
-      loading,
-      isAuthenticated,
-      isPasswordlessUser,
-      client,
-      changePassword,
-      logout,
-      userName,
-      setClient,
-    ]
-  );
-
-  useEffect(() => {
-    window.matrixclient = client;
-    window.isPasswordlessUser = isPasswordlessUser;
-  }, [client, isPasswordlessUser]);
-
-  if (error) {
-    return <ErrorView error={error} />;
-  }
-
-  return (
-    <ClientContext.Provider value={context}>{children}</ClientContext.Provider>
-  );
 };
 
-export const useClient = () => useContext(ClientContext);
+const clientIsDisconnected = (
+  syncState: SyncState,
+  syncData?: ISyncStateData
+) => syncState === "ERROR" && syncData?.error?.name === "ConnectionError";

src/DisconnectedBanner.module.css

@@ -0,0 +1,27 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.banner {
+  position: absolute;
+  padding: 29px;
+  background-color: var(--cpd-color-bg-subtle-primary);
+  vertical-align: middle;
+  font-size: var(--font-size-body);
+  text-align: center;
+  z-index: 1;
+  top: 76px;
+  width: calc(100% - 58px);
+}

src/DisconnectedBanner.tsx

@@ -0,0 +1,53 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import classNames from "classnames";
+import { HTMLAttributes, ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+
+import styles from "./DisconnectedBanner.module.css";
+import { ValidClientState, useClientState } from "./ClientContext";
+
+interface DisconnectedBannerProps extends HTMLAttributes<HTMLElement> {
+  children?: ReactNode;
+  className?: string;
+}
+
+export function DisconnectedBanner({
+  children,
+  className,
+  ...rest
+}: DisconnectedBannerProps) {
+  const { t } = useTranslation();
+  const clientState = useClientState();
+  let shouldShowBanner = false;
+
+  if (clientState?.state === "valid") {
+    const validClientState = clientState as ValidClientState;
+    shouldShowBanner = validClientState.disconnected;
+  }
+
+  return (
+    <>
+      {shouldShowBanner && (
+        <div className={classNames(styles.banner, className)} {...rest}>
+          {children}
+          {t("Connectivity to the server has been lost.")}
+        </div>
+      )}
+    </>
+  );
+}

src/E2EEBanner.module.css

@@ -0,0 +1,23 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.e2eeBanner {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 12px;
+  font-size: var(--font-size-caption);
+}

src/E2EEBanner.tsx

@@ -0,0 +1,39 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Trans } from "react-i18next";
+
+import { Banner } from "./Banner";
+import styles from "./E2EEBanner.module.css";
+import { ReactComponent as LockOffIcon } from "./icons/LockOff.svg";
+import { useEnableE2EE } from "./settings/useSetting";
+
+export const E2EEBanner = () => {
+  const [e2eeEnabled] = useEnableE2EE();
+  if (e2eeEnabled) return null;
+
+  return (
+    <Banner>
+      <div className={styles.e2eeBanner}>
+        <LockOffIcon width={24} height={24} />
+        <Trans>
+          Element Call is temporarily not end-to-end encrypted while we test
+          scalability.
+        </Trans>
+      </div>
+    </Banner>
+  );
+};

src/Facepile.tsx

@@ -14,27 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { HTMLAttributes, useMemo } from "react";
+import { HTMLAttributes } from "react";
-import classNames from "classnames";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { useTranslation } from "react-i18next";
+import { AvatarStack } from "@vector-im/compound-web";
 
-import styles from "./Facepile.module.css";
+import { Avatar, Size } from "./Avatar";
-import { Avatar, Size, sizes } from "./Avatar";
-
-const overlapMap: Partial<Record<Size, number>> = {
-  [Size.XS]: 2,
-  [Size.SM]: 4,
-  [Size.MD]: 8,
-};
 
 interface Props extends HTMLAttributes<HTMLDivElement> {
-  className: string;
+  className?: string;
   client: MatrixClient;
   members: RoomMember[];
   max?: number;
-  size?: Size;
+  size?: Size | number;
 }
 
 export function Facepile({
@@ -47,51 +40,27 @@ export function Facepile({
 }: Props) {
   const { t } = useTranslation();
 
-  const _size = sizes.get(size);
+  const displayedMembers = members.slice(0, max);
-  const _overlap = overlapMap[size];
-
-  const title = useMemo(() => {
-    return members.reduce<string | null>(
-      (prev, curr) =>
-        prev === null
-          ? curr.name
-          : t("{{names}}, {{name}}", { names: prev, name: curr.name }),
-      null
-    ) as string;
-  }, [members, t]);
 
   return (
-    <div
+    <AvatarStack
-      className={classNames(styles.facepile, styles[size], className)}
+      title={t("{{names, list(style: short;)}}", {
-      title={title}
+        list: displayedMembers.map((m) => m.name),
-      style={{
+      })}
-        width:
-          Math.min(members.length, max + 1) * (_size - _overlap) + _overlap,
-      }}
       {...rest}
     >
-      {members.slice(0, max).map((member, i) => {
+      {displayedMembers.map((member, i) => {
         const avatarUrl = member.getMxcAvatarUrl();
         return (
           <Avatar
-            key={member.userId}
+            key={i}
+            id={member.userId}
+            name={member.name}
             size={size}
             src={avatarUrl ?? undefined}
-            fallback={member.name.slice(0, 1).toUpperCase()}
-            className={styles.avatar}
-            style={{ left: i * (_size - _overlap) }}
           />
         );
       })}
-      {members.length > max && (
+    </AvatarStack>
-        <Avatar
-          key="additional"
-          size={size}
-          fallback={`+${members.length - max}`}
-          className={styles.avatar}
-          style={{ left: max * (_size - _overlap) }}
-        />
-      )}
-    </div>
   );
 }

src/FullScreenView.tsx

@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode, useCallback, useEffect } from "react";
+import { ReactNode, useCallback, useEffect } from "react";
 import { useLocation } from "react-router-dom";
 import classNames from "classnames";
 import { Trans, useTranslation } from "react-i18next";
+import * as Sentry from "@sentry/react";
 
 import { Header, HeaderLogo, LeftNav, RightNav } from "./Header";
 import { LinkButton, Button } from "./button";
-import { useSubmitRageshake } from "./settings/submit-rageshake";
-import { ErrorMessage } from "./input/Input";
 import styles from "./FullScreenView.module.css";
-import { translatedError, TranslatedError } from "./TranslatedError";
+import { TranslatedError } from "./TranslatedError";
 import { Config } from "./config/Config";
+import { RageshakeButton } from "./settings/RageshakeButton";
 
 interface FullScreenViewProps {
   className?: string;
@@ -58,6 +58,7 @@ export function ErrorView({ error }: ErrorViewProps) {
 
   useEffect(() => {
     console.error(error);
+    Sentry.captureException(error);
   }, [error]);
 
   const onReload = useCallback(() => {
@@ -72,6 +73,7 @@ export function ErrorView({ error }: ErrorViewProps) {
           ? error.translatedMessage
           : error.message}
       </p>
+      <RageshakeButton description={`***Error View***: ${error.message}`} />
       {location.pathname === "/" ? (
         <Button
           size="lg"
@@ -97,37 +99,11 @@ export function ErrorView({ error }: ErrorViewProps) {
 
 export function CrashView() {
   const { t } = useTranslation();
-  const { submitRageshake, sending, sent, error } = useSubmitRageshake();
-
-  const sendDebugLogs = useCallback(() => {
-    submitRageshake({
-      description: "**Soft Crash**",
-      sendLogs: true,
-    });
-  }, [submitRageshake]);
 
   const onReload = useCallback(() => {
     window.location.href = "/";
   }, []);
 
-  let logsComponent: JSX.Element | null = null;
-  if (sent) {
-    logsComponent = <div>{t("Thanks! We'll get right on it.")}</div>;
-  } else if (sending) {
-    logsComponent = <div>{t("Sending…")}</div>;
-  } else if (Config.get().rageshake?.submit_url) {
-    logsComponent = (
-      <Button
-        size="lg"
-        variant="default"
-        onPress={sendDebugLogs}
-        className={styles.wideButton}
-      >
-        {t("Send debug logs")}
-      </Button>
-    );
-  }
-
   return (
     <FullScreenView>
       <Trans>
@@ -139,10 +115,7 @@ export function CrashView() {
         </Trans>
       )}
 
-      <div className={styles.sendLogsSection}>{logsComponent}</div>
+      <RageshakeButton description="***Soft Crash***" />
-      {error && (
-        <ErrorMessage error={translatedError("Couldn't send debug logs!", t)} />
-      )}
       <Button
         size="lg"
         variant="default"

src/Glass.module.css

@@ -0,0 +1,31 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.glass {
+  border-radius: 36px;
+  padding: 11px;
+  border: 1px solid var(--cpd-color-alpha-gray-400);
+  background: var(--cpd-color-alpha-gray-400);
+  backdrop-filter: blur(10px);
+}
+
+.glass > * {
+  border-radius: 24px;
+}
+
+.glass.frosted {
+  backdrop-filter: blur(20px);
+}

src/Glass.tsx

@@ -0,0 +1,52 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  ComponentPropsWithoutRef,
+  ReactNode,
+  forwardRef,
+  Children,
+} from "react";
+import classNames from "classnames";
+
+import styles from "./Glass.module.css";
+
+interface Props extends ComponentPropsWithoutRef<"div"> {
+  children: ReactNode;
+  className?: string;
+  /**
+   * Increases the blur effect.
+   * @default false
+   */
+  frosted?: boolean;
+}
+
+/**
+ * Adds a border of glass around a child component.
+ */
+export const Glass = forwardRef<HTMLDivElement, Props>(
+  ({ frosted = false, children, className, ...rest }, ref) => (
+    <div
+      ref={ref}
+      className={classNames(className, styles.glass, {
+        [styles.frosted]: frosted,
+      })}
+      {...rest}
+    >
+      {Children.only(children)}
+    </div>
+  )
+);

src/Header.module.css

@@ -21,6 +21,7 @@ limitations under the License.
   align-items: center;
   user-select: none;
   flex-shrink: 0;
+  padding-inline: var(--inline-content-inset);
 }
 
 .nav {
@@ -28,8 +29,7 @@ limitations under the License.
   flex: 1;
   align-items: center;
   white-space: nowrap;
-  padding: 0 20px;
+  height: 80px;
-  height: 64px;
 }
 
 .headerLogo {
@@ -66,81 +66,56 @@ limitations under the License.
   margin-right: 0;
 }
 
+.roomHeaderInfo {
+  display: grid;
+  column-gap: var(--cpd-space-4x);
+  grid-template-columns: auto auto;
+  grid-template-rows: 1fr auto;
+}
+
+.roomHeaderInfo[data-size="sm"] {
+  grid-template-areas: "avatar name" ". participants";
+}
+
+.roomHeaderInfo[data-size="lg"] {
+  grid-template-areas: "avatar name" "avatar participants";
+}
+
 .roomAvatar {
-  position: relative;
+  align-self: flex-start;
-  display: none;
+  grid-area: avatar;
-  justify-content: center;
-  align-items: center;
-  width: 36px;
-  height: 36px;
-  border-radius: 36px;
-  background-color: #5c56f5;
 }
 
-.roomAvatar > * {
+.nameLine {
-  fill: white;
+  grid-area: name;
-  stroke: white;
+  flex-grow: 1;
-}
-
-.backButton {
-  background: transparent;
-  border: none;
   display: flex;
-  color: var(--primary-content);
-  cursor: pointer;
   align-items: center;
+  gap: var(--cpd-space-1x);
 }
 
-.backButton h3 {
+.nameLine > h1 {
   margin: 0;
-}
+  /* XXX I can't actually get this ellipsis overflow to trigger, because
-
+  constraint propagation in a nested flexbox layout is a massive pain */
-.backButton > * {
-  margin-right: 12px;
-}
-
-.backButton > :last-child {
-  margin-right: 0;
-}
-
-.userName {
-  font-weight: 600;
-  margin-right: 8px;
-  text-overflow: ellipsis;
   overflow: hidden;
-  flex-shrink: 1;
+  text-overflow: ellipsis;
 }
 
-.signOutButton {
+.nameLine > svg {
-  background: transparent;
-  border: none;
-  color: rgb(255, 75, 85);
-  cursor: pointer;
-  font-weight: 600;
   flex-shrink: 0;
 }
 
-.versionMismatchWarning {
+.participantsLine {
-  padding-left: 15px;
+  grid-area: participants;
-}
+  display: flex;
-
+  align-items: center;
-.versionMismatchWarning::before {
+  gap: var(--cpd-space-1-5x);
-  content: "";
+  font: var(--cpd-font-body-sm-medium);
-  display: inline-block;
-  position: relative;
-  top: 1px;
-  width: 16px;
-  height: 16px;
-  mask-image: url("./icons/AlertTriangleFilled.svg");
-  mask-repeat: no-repeat;
-  mask-size: contain;
-  background-color: var(--alert);
-  padding-right: 5px;
 }
 
 @media (min-width: 800px) {
   .headerLogo,
-  .roomAvatar,
   .leftNav.hideMobile,
   .rightNav.hideMobile {
     display: flex;
@@ -149,8 +124,4 @@ limitations under the License.
   .leftNav h3 {
     font-size: var(--font-size-subtitle);
   }
-
-  .nav {
-    height: 76px;
-  }
 }

src/Header.stories.jsx

@@ -1,106 +0,0 @@
-import React from "react";
-import { GridLayoutMenu } from "./room/GridLayoutMenu";
-import {
-  Header,
-  HeaderLogo,
-  LeftNav,
-  RightNav,
-  RoomHeaderInfo,
-} from "./Header";
-import { UserMenu } from "./UserMenu";
-
-export default {
-  title: "Header",
-  component: Header,
-  parameters: {
-    layout: "fullscreen",
-  },
-};
-
-export const HomeAnonymous = () => (
-  <Header>
-    <LeftNav>
-      <HeaderLogo />
-    </LeftNav>
-    <RightNav>
-      <UserMenu />
-    </RightNav>
-  </Header>
-);
-
-export const HomeNamedGuest = () => (
-  <Header>
-    <LeftNav>
-      <HeaderLogo />
-    </LeftNav>
-    <RightNav>
-      <UserMenu isAuthenticated isPasswordlessUser displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const HomeLoggedIn = () => (
-  <Header>
-    <LeftNav>
-      <HeaderLogo />
-    </LeftNav>
-    <RightNav>
-      <UserMenu isAuthenticated displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const LobbyNamedGuest = () => (
-  <Header>
-    <LeftNav>
-      <RoomHeaderInfo roomName="Q4Roadmap" />
-    </LeftNav>
-    <RightNav>
-      <UserMenu isAuthenticated isPasswordlessUser displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const LobbyLoggedIn = () => (
-  <Header>
-    <LeftNav>
-      <RoomHeaderInfo roomName="Q4Roadmap" />
-    </LeftNav>
-    <RightNav>
-      <UserMenu isAuthenticated displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const InRoomNamedGuest = () => (
-  <Header>
-    <LeftNav>
-      <RoomHeaderInfo roomName="Q4Roadmap" />
-    </LeftNav>
-    <RightNav>
-      <GridLayoutMenu layout="freedom" />
-      <UserMenu isAuthenticated isPasswordlessUser displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const InRoomLoggedIn = () => (
-  <Header>
-    <LeftNav>
-      <RoomHeaderInfo roomName="Q4Roadmap" />
-    </LeftNav>
-    <RightNav>
-      <GridLayoutMenu layout="freedom" />
-      <UserMenu isAuthenticated displayName="Yara" />
-    </RightNav>
-  </Header>
-);
-
-export const CreateAccount = () => (
-  <Header>
-    <LeftNav>
-      <HeaderLogo />
-    </LeftNav>
-    <RightNav></RightNav>
-  </Header>
-);

src/Header.tsx

@@ -15,22 +15,18 @@ limitations under the License.
 */
 
 import classNames from "classnames";
-import React, { HTMLAttributes, ReactNode, useCallback, useRef } from "react";
+import { FC, HTMLAttributes, ReactNode } from "react";
 import { Link } from "react-router-dom";
-import { useButton } from "@react-aria/button";
-import { AriaButtonProps } from "@react-types/button";
-import { Room } from "matrix-js-sdk/src/models/room";
 import { useTranslation } from "react-i18next";
+import { MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { Heading } from "@vector-im/compound-web";
 
 import styles from "./Header.module.css";
-import { useModalTriggerState } from "./Modal";
-import { Button } from "./button";
 import { ReactComponent as Logo } from "./icons/Logo.svg";
-import { ReactComponent as VideoIcon } from "./icons/Video.svg";
-import { Subtitle } from "./typography/Typography";
 import { Avatar, Size } from "./Avatar";
-import { IncompatibleVersionModal } from "./IncompatibleVersionModal";
+import { Facepile } from "./Facepile";
-import { ReactComponent as ArrowLeftIcon } from "./icons/ArrowLeft.svg";
+import { EncryptionLock } from "./room/EncryptionLock";
+import { useMediaQuery } from "./useMediaQuery";
 
 interface HeaderProps extends HTMLAttributes<HTMLElement> {
   children: ReactNode;
@@ -117,86 +113,52 @@ export function HeaderLogo({ className }: HeaderLogoProps) {
   );
 }
 
-interface RoomHeaderInfo {
+interface RoomHeaderInfoProps {
-  roomName: string;
+  id: string;
-  avatarUrl: string;
+  name: string;
+  avatarUrl: string | null;
+  encrypted: boolean;
+  participants: RoomMember[];
+  client: MatrixClient;
 }
 
-export function RoomHeaderInfo({ roomName, avatarUrl }: RoomHeaderInfo) {
+export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
-  return (
+  id,
-    <>
+  name,
-      <div className={styles.roomAvatar}>
-        <Avatar
-          size={Size.MD}
-          src={avatarUrl}
-          bgKey={roomName}
-          fallback={roomName.slice(0, 1).toUpperCase()}
-        />
-        <VideoIcon width={16} height={16} />
-      </div>
-      <Subtitle fontWeight="semiBold">{roomName}</Subtitle>
-    </>
-  );
-}
-
-interface RoomSetupHeaderInfoProps extends AriaButtonProps<"button"> {
-  roomName: string;
-  avatarUrl: string;
-  isEmbedded: boolean;
-}
-
-export function RoomSetupHeaderInfo({
-  roomName,
   avatarUrl,
-  isEmbedded,
+  encrypted,
-  ...rest
+  participants,
-}: RoomSetupHeaderInfoProps) {
+  client,
-  const ref = useRef();
+}) => {
-  const { buttonProps } = useButton(rest, ref);
+  const { t } = useTranslation();
+  const size = useMediaQuery("(max-width: 550px)") ? "sm" : "lg";
 
-  if (isEmbedded) {
   return (
-      <div ref={ref}>
+    <div className={styles.roomHeaderInfo} data-size={size}>
-        <RoomHeaderInfo roomName={roomName} avatarUrl={avatarUrl} />
+      <Avatar
+        className={styles.roomAvatar}
+        id={id}
+        name={name}
+        size={size === "sm" ? Size.SM : 56}
+        src={avatarUrl ?? undefined}
+      />
+      <div className={styles.nameLine}>
+        <Heading
+          type={size === "sm" ? "body" : "heading"}
+          size={size === "sm" ? "lg" : "md"}
+          weight="semibold"
+          data-testid="roomHeader_roomName"
+        >
+          {name}
+        </Heading>
+        <EncryptionLock encrypted={encrypted} />
+      </div>
+      {participants.length > 0 && (
+        <div className={styles.participantsLine}>
+          <Facepile client={client} members={participants} size={20} />
+          {t("{{count, number}}", { count: participants.length })}
+        </div>
+      )}
     </div>
   );
-  }
+};
-
-  return (
-    <button className={styles.backButton} ref={ref} {...buttonProps}>
-      <ArrowLeftIcon width={16} height={16} />
-      <RoomHeaderInfo roomName={roomName} avatarUrl={avatarUrl} />
-    </button>
-  );
-}
-
-interface VersionMismatchWarningProps {
-  users: Set<string>;
-  room: Room;
-}
-
-export function VersionMismatchWarning({
-  users,
-  room,
-}: VersionMismatchWarningProps) {
-  const { t } = useTranslation();
-  const { modalState, modalProps } = useModalTriggerState();
-
-  const onDetailsClick = useCallback(() => {
-    modalState.open();
-  }, [modalState]);
-
-  if (users.size === 0) return null;
-
-  return (
-    <span className={styles.versionMismatchWarning}>
-      {t("Incompatible versions!")}
-      <Button variant="link" onClick={onDetailsClick}>
-        {t("Details")}
-      </Button>
-      {modalState.isOpen && (
-        <IncompatibleVersionModal userIds={users} room={room} {...modalProps} />
-      )}
-    </span>
-  );
-}

src/IncompatibleVersionModal.tsx

@@ -1,60 +0,0 @@
-/*
-Copyright 2022 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { Room } from "matrix-js-sdk/src/models/room";
-import React, { useMemo } from "react";
-import { Trans, useTranslation } from "react-i18next";
-
-import { Modal, ModalContent } from "./Modal";
-import { Body } from "./typography/Typography";
-
-interface Props {
-  userIds: Set<string>;
-  room: Room;
-  onClose: () => void;
-}
-
-export const IncompatibleVersionModal: React.FC<Props> = ({
-  userIds,
-  room,
-  onClose,
-  ...rest
-}) => {
-  const { t } = useTranslation();
-  const userLis = useMemo(
-    () => [...userIds].map((u) => <li>{room.getMember(u)?.name ?? u}</li>),
-    [userIds, room]
-  );
-
-  return (
-    <Modal
-      title={t("Incompatible versions")}
-      isDismissable
-      onClose={onClose}
-      {...rest}
-    >
-      <ModalContent>
-        <Body>
-          <Trans>
-            Other users are trying to join this call from incompatible versions.
-            These users should ensure that they have refreshed their browsers:
-            <ul>{userLis}</ul>
-          </Trans>
-        </Body>
-      </ModalContent>
-    </Modal>
-  );
-};

src/ListBox.module.css

@@ -21,8 +21,8 @@ limitations under the License.
   overflow-y: auto;
   list-style: none;
   background-color: transparent;
-  border: 1px solid var(--quinary-content);
+  border: 1px solid var(--cpd-color-border-interactive-secondary);
-  background-color: var(--background);
+  background-color: var(--cpd-color-bg-canvas-default);
   border-radius: 8px;
 }
 
@@ -31,7 +31,7 @@ limitations under the License.
   align-items: center;
   justify-content: space-between;
   background-color: transparent;
-  color: var(--primary-content);
+  color: var(--cpd-color-text-primary);
   padding: 8px 16px;
   outline: none;
   cursor: pointer;
@@ -44,6 +44,6 @@ limitations under the License.
 }
 
 .option.disabled {
-  color: var(--quaternary-content);
+  color: var(--cpd-color-text-disabled);
-  background-color: var(--bgColor3);
+  background-color: var(--stopgap-bgColor3);
 }

src/ListBox.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useCallback, useRef } from "react";
+import { MutableRefObject, PointerEvent, useCallback, useRef } from "react";
 import { useListBox, useOption, AriaListBoxOptions } from "@react-aria/listbox";
 import { ListState } from "@react-stately/list";
 import { Node } from "@react-types/shared";
@@ -26,7 +26,7 @@ interface ListBoxProps<T> extends AriaListBoxOptions<T> {
   optionClassName: string;
   state: ListState<T>;
   className?: string;
-  listBoxRef?: React.MutableRefObject<HTMLUListElement>;
+  listBoxRef?: MutableRefObject<HTMLUListElement>;
 }
 
 export function ListBox<T>({
@@ -36,15 +36,16 @@ export function ListBox<T>({
   listBoxRef,
   ...rest
 }: ListBoxProps<T>) {
-  const ref = useRef<HTMLUListElement>();
+  const ref = useRef<HTMLUListElement>(null);
-  if (!listBoxRef) listBoxRef = ref;
 
-  const { listBoxProps } = useListBox(rest, state, listBoxRef);
+  const listRef = listBoxRef ?? ref;
+
+  const { listBoxProps } = useListBox(rest, state, listRef);
 
   return (
     <ul
       {...listBoxProps}
-      ref={listBoxRef}
+      ref={listRef}
       className={classNames(styles.listBox, className)}
     >
       {[...state.collection].map((item) => (
@@ -66,7 +67,7 @@ interface OptionProps<T> {
 }
 
 function Option<T>({ item, state, className }: OptionProps<T>) {
-  const ref = useRef();
+  const ref = useRef(null);
   const { optionProps, isSelected, isFocused, isDisabled } = useOption(
     { key: item.key },
     state,
@@ -83,8 +84,12 @@ function Option<T>({ item, state, className }: OptionProps<T>) {
   const origPointerUp = optionProps.onPointerUp;
   delete optionProps.onPointerUp;
   optionProps.onClick = useCallback(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     (e) => {
-      origPointerUp(e as unknown as React.PointerEvent<HTMLElement>);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      origPointerUp(e as unknown as PointerEvent<HTMLElement>);
     },
     [origPointerUp]
   );

src/Menu.module.css

@@ -27,7 +27,7 @@ limitations under the License.
   display: flex;
   align-items: center;
   padding: 0 12px;
-  color: var(--primary-content);
+  color: var(--cpd-color-text-primary);
   font-size: var(--font-size-body);
   text-overflow: ellipsis;
   overflow: hidden;
@@ -44,7 +44,11 @@ limitations under the License.
 
 .menuItem.focused,
 .menuItem:hover {
-  background-color: var(--quinary-content);
+  background-color: var(--cpd-color-bg-action-secondary-hovered);
+}
+
+.menuItem:active {
+  background-color: var(--cpd-color-bg-action-secondary-pressed);
 }
 
 .menuItem.focused:first-child,
@@ -65,5 +69,5 @@ limitations under the License.
 }
 
 .checkIcon * {
-  stroke: var(--primary-content);
+  stroke: var(--cpd-color-text-primary);
 }

src/Menu.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { Key, useRef, useState } from "react";
+import { Key, useRef, useState } from "react";
 import { AriaMenuOptions, useMenu, useMenuItem } from "@react-aria/menu";
 import { TreeState, useTreeState } from "@react-stately/tree";
 import { mergeProps } from "@react-aria/utils";
@@ -25,8 +25,8 @@ import { Node } from "@react-types/shared";
 import styles from "./Menu.module.css";
 
 interface MenuProps<T> extends AriaMenuOptions<T> {
-  className?: String;
+  className?: string;
-  onClose?: () => void;
+  onClose: () => void;
   onAction: (value: Key) => void;
   label?: string;
 }
@@ -39,7 +39,7 @@ export function Menu<T extends object>({
   ...rest
 }: MenuProps<T>) {
   const state = useTreeState<T>({ ...rest, selectionMode: "none" });
-  const menuRef = useRef();
+  const menuRef = useRef(null);
   const { menuProps } = useMenu<T>(rest, state, menuRef);
 
   return (
@@ -69,7 +69,7 @@ interface MenuItemProps<T> {
 }
 
 function MenuItem<T>({ item, state, onAction, onClose }: MenuItemProps<T>) {
-  const ref = useRef();
+  const ref = useRef(null);
   const { menuItemProps } = useMenuItem(
     {
       key: item.key,

src/Modal.module.css

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022 - 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,77 +14,210 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.modalOverlay {
+.overlay {
   position: fixed;
   z-index: 100;
-  top: 0;
+  inset: 0;
-  left: 0;
+  background: rgba(3, 12, 27, 0.528);
-  bottom: 0;
+}
-  right: 0;
+
-  background: rgba(23, 25, 28, 0.5);
+@keyframes fade-in {
-  display: flex;
+  from {
-  align-items: center;
+    opacity: 0;
-  justify-content: center;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.dialogOverlay[data-state="open"] {
+  animation: fade-in 200ms;
+}
+
+@keyframes fade-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.dialogOverlay[data-state="closed"] {
+  animation: fade-out 130ms;
 }
 
 .modal {
-  background: #21262c;
+  position: fixed;
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.15);
+  z-index: 101;
-  border-radius: 8px;
-  max-width: 90vw;
-  width: 600px;
   display: flex;
   flex-direction: column;
 }
 
-.modalHeader {
+.dialog {
-  display: flex;
+  left: 50%;
-  justify-content: space-between;
+  top: 50%;
-  padding: 34px 34px 0 34px;
+  transform: translate(-50%, -50%);
+  box-sizing: border-box;
+  inline-size: 520px;
+  max-inline-size: 90%;
+  max-block-size: 600px;
 }
 
-.modalHeader h3 {
+@keyframes zoom-in {
-  font-weight: 600;
+  from {
-  font-size: var(--font-size-title);
+    opacity: 0;
-  margin: 0;
+    transform: translate(-50%, -50%) scale(80%);
+  }
+  to {
+    opacity: 1;
+    transform: translate(-50%, -50%) scale(100%);
+  }
 }
 
-.closeButton {
+@keyframes zoom-out {
-  position: relative;
+  from {
-  display: flex;
+    opacity: 1;
-  justify-content: center;
+    transform: translate(-50%, -50%) scale(100%);
-  align-items: center;
+  }
-  background-color: transparent;
+  to {
-  padding: 0;
+    opacity: 0;
-  border: none;
+    transform: translate(-50%, -50%) scale(80%);
-  cursor: pointer;
+  }
+}
+
+.dialog[data-state="open"] {
+  animation: zoom-in 200ms;
+}
+
+.dialog[data-state="closed"] {
+  animation: zoom-out 130ms;
+}
+
+@media (prefers-reduced-motion) {
+  .dialog[data-state="open"] {
+    animation-name: fade-in;
+  }
+
+  .dialog[data-state="closed"] {
+    animation-name: fade-out;
+  }
 }
 
 .content {
-  padding: 24px 32px;
-}
-
-.content p {
-  margin-top: 0;
-}
-
-@media (max-width: 799px) {
-  .modalHeader {
   display: flex;
-    justify-content: space-between;
+  flex-direction: column;
-    padding: 24px 24px 0 24px;
+  overflow: hidden;
-  }
+  flex-grow: 1;
+}
 
-  .modal.mobileFullScreen {
+.dialog .content {
-    position: fixed;
+  background: var(--cpd-color-bg-canvas-default);
-    left: 0;
+}
-    right: 0;
+
-    top: 0;
+.drawer .content {
-    bottom: 0;
+  overflow: auto;
-    width: 100%;
+}
-    height: 100%;
+
-    max-width: none;
+.drawer {
-    max-height: none;
+  background: var(--cpd-color-bg-canvas-default);
-    border-radius: 0;
+  inset-block-end: 0;
+  inset-inline: max(0px, calc((100% - 520px) / 2));
+  max-block-size: 90%;
+  border-start-start-radius: var(--border-radius);
+  border-start-end-radius: var(--border-radius);
+  /* Drawer comes in the Android style by default */
+  --border-radius: 28px;
+  --handle-block-size: 4px;
+  --handle-inline-size: 32px;
+  --handle-inset-block-start: var(--cpd-space-4x);
+  --handle-inset-block-end: var(--cpd-space-4x);
+}
+
+body[data-platform="ios"] .drawer {
+  --border-radius: 10px;
+  --handle-block-size: 5px;
+  --handle-inline-size: 36px;
+  --handle-inset-block-start: var(--cpd-space-1-5x);
+  --handle-inset-block-end: calc(var(--cpd-space-1x) / 4);
+}
+
+.close {
+  cursor: pointer;
+  color: var(--cpd-color-icon-secondary);
+  border-radius: var(--cpd-radius-pill-effect);
+  padding: var(--cpd-space-1x);
+  background: var(--cpd-color-bg-subtle-secondary);
+  border: none;
+}
+
+.close svg {
+  display: block;
+}
+
+@media (hover: hover) {
+  .close:hover {
+    background: var(--cpd-color-bg-subtle-primary);
+    color: var(--cpd-color-icon-primary);
   }
 }
+
+.close:active {
+  background: var(--cpd-color-bg-subtle-primary);
+  color: var(--cpd-color-icon-primary);
+}
+
+.header {
+  background: var(--cpd-color-bg-subtle-secondary);
+  display: grid;
+}
+
+.dialog .header {
+  padding-block-start: var(--cpd-space-4x);
+  grid-template-columns:
+    var(--cpd-space-10x) 1fr minmax(var(--cpd-space-6x), auto)
+    var(--cpd-space-4x);
+  grid-template-rows: auto minmax(var(--cpd-space-4x), auto);
+  /* TODO: Support tabs */
+  grid-template-areas: ". title close ." "tabs tabs tabs tabs";
+  align-items: center;
+}
+
+.dialog .header h2 {
+  grid-area: title;
+  margin: 0;
+}
+
+.drawer .header {
+  grid-template-areas: "tabs";
+  position: relative;
+}
+
+.close {
+  grid-area: close;
+}
+
+.body {
+  flex-grow: 1;
+}
+
+.dialog .body {
+  padding-inline: var(--cpd-space-10x);
+  padding-block: var(--cpd-space-10x) var(--cpd-space-12x);
+  overflow: auto;
+}
+
+.drawer .body {
+  padding-inline: var(--cpd-space-4x);
+  padding-block: var(--cpd-space-9x) var(--cpd-space-10x);
+}
+
+.handle {
+  content: "";
+  position: absolute;
+  block-size: var(--handle-block-size);
+  inset-inline: calc((100% - var(--handle-inline-size)) / 2);
+  inset-block-start: var(--handle-inset-block-start);
+  background: var(--cpd-color-icon-secondary);
+  border-radius: var(--cpd-radius-pill-effect);
+}

src/Modal.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,191 +14,130 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* eslint-disable jsx-a11y/no-autofocus */
+import { ReactNode, useCallback } from "react";
-
-import React, { useRef, useMemo, ReactNode } from "react";
-import {
-  useOverlay,
-  usePreventScroll,
-  useModal,
-  OverlayContainer,
-  OverlayProps,
-} from "@react-aria/overlays";
-import {
-  OverlayTriggerState,
-  useOverlayTriggerState,
-} from "@react-stately/overlays";
-import { useDialog } from "@react-aria/dialog";
-import { FocusScope } from "@react-aria/focus";
-import { ButtonAria, useButton } from "@react-aria/button";
-import classNames from "classnames";
 import { AriaDialogProps } from "@react-types/dialog";
 import { useTranslation } from "react-i18next";
+import {
+  Root as DialogRoot,
+  Portal as DialogPortal,
+  Overlay as DialogOverlay,
+  Content as DialogContent,
+  Title as DialogTitle,
+  Close as DialogClose,
+} from "@radix-ui/react-dialog";
+import { Drawer } from "vaul";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { ReactComponent as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg";
+import classNames from "classnames";
+import { Heading } from "@vector-im/compound-web";
 
-import { ReactComponent as CloseIcon } from "./icons/Close.svg";
 import styles from "./Modal.module.css";
+import { useMediaQuery } from "./useMediaQuery";
+import { Glass } from "./Glass";
 
-export interface ModalProps extends OverlayProps, AriaDialogProps {
+// TODO: Support tabs
+export interface ModalProps extends AriaDialogProps {
   title: string;
   children: ReactNode;
   className?: string;
-  mobileFullScreen?: boolean;
+  /**
-  onClose: () => void;
+   * The controlled open state of the modal.
+   */
+  // An option to leave the open state uncontrolled is intentionally not
+  // provided, since modals are always opened due to external triggers, and it
+  // is the author's belief that controlled components lead to more obvious code.
+  open: boolean;
+  /**
+   * Callback for when the user dismisses the modal. If undefined, the modal
+   * will be non-dismissable.
+   */
+  onDismiss?: () => void;
 }
 
+/**
+ * A modal, taking the form of a drawer / bottom sheet on touchscreen devices,
+ * and a dialog box on desktop.
+ */
 export function Modal({
   title,
   children,
   className,
-  mobileFullScreen,
+  open,
-  onClose,
+  onDismiss,
   ...rest
 }: ModalProps) {
   const { t } = useTranslation();
-  const modalRef = useRef();
+  // Empirically, Chrome on Android can end up not matching (hover: none), but
-  const { overlayProps, underlayProps } = useOverlay(
+  // still matching (pointer: coarse) :/
-    { ...rest, onClose },
+  const touchscreen = useMediaQuery("(hover: none) or (pointer: coarse)");
-    modalRef
+  const onOpenChange = useCallback(
-  );
+    (open: boolean) => {
-  usePreventScroll();
+      if (!open) onDismiss?.();
-  const { modalProps } = useModal();
-  const { dialogProps, titleProps } = useDialog(rest, modalRef);
-  const closeButtonRef = useRef();
-  const { buttonProps: closeButtonProps } = useButton(
-    {
-      onPress: () => onClose(),
     },
-    closeButtonRef
+    [onDismiss]
   );
 
+  if (touchscreen) {
     return (
-    <OverlayContainer>
+      <Drawer.Root
-      <div className={styles.modalOverlay} {...underlayProps}>
+        open={open}
-        <FocusScope contain restoreFocus autoFocus>
+        onOpenChange={onOpenChange}
-          <div
+        dismissible={onDismiss !== undefined}
-            {...overlayProps}
+      >
-            {...dialogProps}
+        <Drawer.Portal>
-            {...modalProps}
+          <Drawer.Overlay className={styles.overlay} />
-            ref={modalRef}
+          <Drawer.Content
-            className={classNames(
+            className={classNames(className, styles.modal, styles.drawer)}
-              styles.modal,
+            {...rest}
-              { [styles.mobileFullScreen]: mobileFullScreen },
+          >
-              className
+            <div className={styles.content}>
+              <div className={styles.header}>
+                <div className={styles.handle} />
+                <VisuallyHidden asChild>
+                  <Drawer.Title>{title}</Drawer.Title>
+                </VisuallyHidden>
+              </div>
+              <div className={styles.body}>{children}</div>
+            </div>
+          </Drawer.Content>
+        </Drawer.Portal>
+      </Drawer.Root>
+    );
+  } else {
+    return (
+      <DialogRoot open={open} onOpenChange={onOpenChange}>
+        <DialogPortal>
+          <DialogOverlay
+            className={classNames(styles.overlay, styles.dialogOverlay)}
+          />
+          <DialogContent asChild {...rest}>
+            <Glass
+              frosted
+              className={classNames(className, styles.modal, styles.dialog)}
+            >
+              <div className={styles.content}>
+                <div className={styles.header}>
+                  <DialogTitle asChild>
+                    <Heading as="h2" weight="semibold" size="md">
+                      {title}
+                    </Heading>
+                  </DialogTitle>
+                  {onDismiss !== undefined && (
+                    <DialogClose
+                      className={styles.close}
+                      data-testid="modal_close"
+                      aria-label={t("Close")}
+                    >
+                      <CloseIcon width={20} height={20} />
+                    </DialogClose>
                   )}
-          >
-            <div className={styles.modalHeader}>
-              <h3 {...titleProps}>{title}</h3>
-              <button
-                {...closeButtonProps}
-                ref={closeButtonRef}
-                className={styles.closeButton}
-                title={t("Close")}
-              >
-                <CloseIcon />
-              </button>
                 </div>
-            {children}
+                <div className={styles.body}>{children}</div>
               </div>
-        </FocusScope>
+            </Glass>
-      </div>
+          </DialogContent>
-    </OverlayContainer>
+        </DialogPortal>
-  );
+      </DialogRoot>
-}
-
-interface ModalContentProps {
-  children: ReactNode;
-  className?: string;
-}
-
-export function ModalContent({
-  children,
-  className,
-  ...rest
-}: ModalContentProps) {
-  return (
-    <div className={classNames(styles.content, className)} {...rest}>
-      {children}
-    </div>
-  );
-}
-
-export function useModalTriggerState(): {
-  modalState: OverlayTriggerState;
-  modalProps: { isOpen: boolean; onClose: () => void };
-} {
-  const modalState = useOverlayTriggerState({});
-  const modalProps = useMemo(
-    () => ({ isOpen: modalState.isOpen, onClose: modalState.close }),
-    [modalState]
-  );
-  return { modalState, modalProps };
-}
-
-export function useToggleModalButton(
-  modalState: OverlayTriggerState,
-  ref: React.RefObject<HTMLButtonElement>
-): ButtonAria<React.ButtonHTMLAttributes<HTMLButtonElement>> {
-  return useButton(
-    {
-      onPress: () => modalState.toggle(),
-    },
-    ref
-  );
-}
-
-export function useOpenModalButton(
-  modalState: OverlayTriggerState,
-  ref: React.RefObject<HTMLButtonElement>
-): ButtonAria<React.ButtonHTMLAttributes<HTMLButtonElement>> {
-  return useButton(
-    {
-      onPress: () => modalState.open(),
-    },
-    ref
-  );
-}
-
-export function useCloseModalButton(
-  modalState: OverlayTriggerState,
-  ref: React.RefObject<HTMLButtonElement>
-): ButtonAria<React.ButtonHTMLAttributes<HTMLButtonElement>> {
-  return useButton(
-    {
-      onPress: () => modalState.close(),
-    },
-    ref
-  );
-}
-
-interface ModalTriggerProps {
-  children: ReactNode;
-}
-
-export function ModalTrigger({ children }: ModalTriggerProps) {
-  const { modalState, modalProps } = useModalTriggerState();
-  const buttonRef = useRef();
-  const { buttonProps } = useToggleModalButton(modalState, buttonRef);
-
-  if (
-    !Array.isArray(children) ||
-    children.length > 2 ||
-    typeof children[1] !== "function"
-  ) {
-    throw new Error(
-      "ModalTrigger must have two props. The first being a button and the second being a render prop."
     );
   }
-
-  const [modalTrigger, modal] = children;
-
-  return (
-    <>
-      <modalTrigger.type
-        {...modalTrigger.props}
-        {...buttonProps}
-        ref={buttonRef}
-      />
-      {modalState.isOpen && modal(modalProps)}
-    </>
-  );
 }

src/Platform.ts

@@ -0,0 +1,38 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * The platform on which the application is running.
+ */
+// The granularity of this value is kind of arbitrary: it distinguishes exactly
+// the platforms that the app needs to know about in order to correctly
+// implement the designs and work around platform-specific browser weirdness.
+// Feel free to increase or decrease that granularity in the future as project
+// requirements change.
+export let platform: "android" | "ios" | "desktop";
+
+if (/android/i.test(navigator.userAgent)) {
+  platform = "android";
+  // We include 'Mac' here and double-check for touch support because iPads on
+  // iOS 13 pretend to be a MacOS desktop
+} else if (
+  /iPad|iPhone|iPod|Mac/.test(navigator.userAgent) &&
+  "ontouchend" in document
+) {
+  platform = "ios";
+} else {
+  platform = "desktop";
+}

src/SequenceDiagramViewerPage.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useCallback, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import {
@@ -36,6 +36,9 @@ export function SequenceDiagramViewerPage() {
 
   const [debugLog, setDebugLog] = useState<DebugLog>();
   const [selectedUserId, setSelectedUserId] = useState<string>();
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   const onChangeDebugLog = useCallback((e) => {
     if (e.target.files && e.target.files.length > 0) {
       e.target.files[0].text().then((text: string) => {
@@ -55,7 +58,7 @@ export function SequenceDiagramViewerPage() {
           onChange={onChangeDebugLog}
         />
       </FieldRow>
-      {debugLog && (
+      {debugLog && selectedUserId && (
         <SequenceDiagramViewer
           localUserId={debugLog.localUserId}
           selectedUserId={selectedUserId}

src/Tooltip.module.css

@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 .tooltip {
-  background-color: var(--system);
+  background-color: var(--cpd-color-bg-subtle-secondary);
   flex-direction: row;
   justify-content: center;
   align-items: center;
   padding: 10px;
-  color: var(--primary-content);
+  color: var(--cpd-color-text-primary);
   border-radius: 8px;
   max-width: 135px;
   width: max-content;

src/Tooltip.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {
+import {
   ForwardedRef,
   forwardRef,
   ReactElement,
@@ -40,7 +40,7 @@ interface TooltipProps {
   children: ReactNode;
 }
 
-export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
+const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
   (
     { state, className, children, ...rest }: TooltipProps,
     ref: ForwardedRef<HTMLDivElement>
@@ -74,7 +74,7 @@ export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
     const tooltipTriggerProps = { delay: 250, ...rest };
     const tooltipState = useTooltipTriggerState(tooltipTriggerProps);
     const triggerRef = useObjectRef<HTMLElement>(ref);
-    const overlayRef = useRef();
+    const overlayRef = useRef<HTMLDivElement>(null);
     const { triggerProps, tooltipProps } = useTooltipTrigger(
       tooltipTriggerProps,
       tooltipState,

src/UrlParams.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022 - 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,15 +17,39 @@ limitations under the License.
 import { useMemo } from "react";
 import { useLocation } from "react-router-dom";
 
-export interface UrlParams {
+import { Config } from "./config/Config";
+
+export const PASSWORD_STRING = "password=";
+
+interface RoomIdentifier {
   roomAlias: string | null;
   roomId: string | null;
   viaServers: string[];
+}
+
+// If you need to add a new flag to this interface, prefer a name that describes
+// a specific behavior (such as 'confineToRoom'), rather than one that describes
+// the situations that call for this behavior ('isEmbedded'). This makes it
+// clearer what each flag means, and helps us avoid coupling Element Call's
+// behavior to the needs of specific consumers.
+interface UrlParams {
   /**
-   * Whether the app is running in embedded mode, and should keep the user
+   * Anything about what room we're pointed to should be from useRoomIdentifier which
-   * confined to the current room.
+   * parses the path and resolves alias with respect to the default server name, however
+   * roomId is an exception as we need the room ID in embedded (matroyska) mode, and not
+   * the room alias (or even the via params because we are not trying to join it). This
+   * is also not validated, where it is in useRoomIdentifier().
    */
-  isEmbedded: boolean;
+  roomId: string | null;
+  /**
+   * Whether the app should keep the user confined to the current call/room.
+   */
+  confineToRoom: boolean;
+  /**
+   * Whether upon entering a room, the user should be prompted to launch the
+   * native mobile app. (Affects only Android and iOS.)
+   */
+  appPrompt: boolean;
   /**
    * Whether the app should pause before joining the call until it sees an
    * io.element.join widget action, allowing it to be preloaded.
@@ -39,10 +63,6 @@ export interface UrlParams {
    * Whether to hide the screen-sharing button.
    */
   hideScreensharing: boolean;
-  /**
-   * Whether to start a walkie-talkie call instead of a video call.
-   */
-  isPtt: boolean;
   /**
    * Whether to use end-to-end encryption.
    */
@@ -79,62 +99,107 @@ export interface UrlParams {
    * The Posthog analytics ID. It is only available if the user has given consent for sharing telemetry in element web.
    */
   analyticsID: string | null;
+  /**
+   * Whether the app is allowed to use fallback STUN servers for ICE in case the
+   * user's homeserver doesn't provide any.
+   */
+  allowIceFallback: boolean;
+  /**
+   * E2EE password
+   */
+  password: string | null;
 }
 
-/**
+// This is here as a stopgap, but what would be far nicer is a function that
- * Gets the app parameters for the current URL.
+// takes a UrlParams and returns a query string. That would enable us to
- * @param query The URL query string
+// consolidate all the data about URL parameters and their meanings to this one
- * @param fragment The URL fragment string
+// file.
- * @returns The app parameters encoded in the URL
+export function editFragmentQuery(
- */
+  hash: string,
-export const getUrlParams = (
+  edit: (params: URLSearchParams) => URLSearchParams
-  query: string = window.location.search,
+): string {
-  fragment: string = window.location.hash
+  const fragmentQueryStart = hash.indexOf("?");
-): UrlParams => {
+  const fragmentParams = edit(
-  const fragmentQueryStart = fragment.indexOf("?");
+    new URLSearchParams(
-  const fragmentParams = new URLSearchParams(
+      fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
-    fragmentQueryStart === -1 ? "" : fragment.substring(fragmentQueryStart)
+    )
   );
-  const queryParams = new URLSearchParams(query);
+  return `${hash.substring(
+    0,
+    fragmentQueryStart
+  )}?${fragmentParams.toString()}`;
+}
+
+class ParamParser {
+  private fragmentParams: URLSearchParams;
+  private queryParams: URLSearchParams;
+
+  constructor(search: string, hash: string) {
+    this.queryParams = new URLSearchParams(search);
+
+    const fragmentQueryStart = hash.indexOf("?");
+    this.fragmentParams = new URLSearchParams(
+      fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
+    );
+  }
 
   // Normally, URL params should be encoded in the fragment so as to avoid
   // leaking them to the server. However, we also check the normal query
   // string for backwards compatibility with versions that only used that.
-  const hasParam = (name: string): boolean =>
+  getParam(name: string): string | null {
-    fragmentParams.has(name) || queryParams.has(name);
+    return this.fragmentParams.get(name) ?? this.queryParams.get(name);
-  const getParam = (name: string): string | null =>
+  }
-    fragmentParams.get(name) ?? queryParams.get(name);
+
-  const getAllParams = (name: string): string[] => [
+  getAllParams(name: string): string[] {
-    ...fragmentParams.getAll(name),
+    return [
-    ...queryParams.getAll(name),
+      ...this.fragmentParams.getAll(name),
+      ...this.queryParams.getAll(name),
     ];
+  }
 
-  // The part of the fragment before the ?
+  getFlagParam(name: string, defaultValue = false): boolean {
-  const fragmentRoute =
+    const param = this.getParam(name);
-    fragmentQueryStart === -1
+    return param === null ? defaultValue : param !== "false";
-      ? fragment
+  }
-      : fragment.substring(0, fragmentQueryStart);
+}
 
-  const fontScale = parseFloat(getParam("fontScale") ?? "");
+/**
+ * Gets the app parameters for the current URL.
+ * @param search The URL search string
+ * @param hash The URL hash
+ * @returns The app parameters encoded in the URL
+ */
+export const getUrlParams = (
+  search = window.location.search,
+  hash = window.location.hash
+): UrlParams => {
+  const parser = new ParamParser(search, hash);
+
+  const fontScale = parseFloat(parser.getParam("fontScale") ?? "");
 
   return {
-    roomAlias: fragmentRoute.length > 1 ? fragmentRoute : null,
+    // NB. we don't validate roomId here as we do in getRoomIdentifierFromUrl:
-    roomId: getParam("roomId"),
+    // what would we do if it were invalid? If the widget API says that's what
-    viaServers: getAllParams("via"),
+    // the room ID is, then that's what it is.
-    isEmbedded: hasParam("embed"),
+    roomId: parser.getParam("roomId"),
-    preload: hasParam("preload"),
+    password: parser.getParam("password"),
-    hideHeader: hasParam("hideHeader"),
+    // This flag has 'embed' as an alias for historical reasons
-    hideScreensharing: hasParam("hideScreensharing"),
+    confineToRoom:
-    isPtt: hasParam("ptt"),
+      parser.getFlagParam("confineToRoom") || parser.getFlagParam("embed"),
-    e2eEnabled: getParam("enableE2e") !== "false", // Defaults to true
+    appPrompt: parser.getFlagParam("appPrompt", true),
-    userId: getParam("userId"),
+    preload: parser.getFlagParam("preload"),
-    displayName: getParam("displayName"),
+    hideHeader: parser.getFlagParam("hideHeader"),
-    deviceId: getParam("deviceId"),
+    hideScreensharing: parser.getFlagParam("hideScreensharing"),
-    baseUrl: getParam("baseUrl"),
+    e2eEnabled: parser.getFlagParam("enableE2e", true),
-    lang: getParam("lang"),
+    userId: parser.getParam("userId"),
-    fonts: getAllParams("font"),
+    displayName: parser.getParam("displayName"),
+    deviceId: parser.getParam("deviceId"),
+    baseUrl: parser.getParam("baseUrl"),
+    lang: parser.getParam("lang"),
+    fonts: parser.getAllParams("font"),
     fontScale: Number.isNaN(fontScale) ? null : fontScale,
-    analyticsID: getParam("analyticsID"),
+    analyticsID: parser.getParam("analyticsID"),
+    allowIceFallback: parser.getFlagParam("allowIceFallback"),
   };
 };
 
@@ -143,6 +208,67 @@ export const getUrlParams = (
  * @returns The app parameters for the current URL
  */
 export const useUrlParams = (): UrlParams => {
-  const { hash, search } = useLocation();
+  const { search, hash } = useLocation();
   return useMemo(() => getUrlParams(search, hash), [search, hash]);
 };
+
+export function getRoomIdentifierFromUrl(
+  pathname: string,
+  search: string,
+  hash: string
+): RoomIdentifier {
+  let roomAlias: string | null = null;
+
+  // Here we handle the beginning of the alias and make sure it starts with a "#"
+  if (hash === "" || hash.startsWith("#?")) {
+    roomAlias = pathname.substring(1); // Strip the "/"
+
+    // Delete "/room/", if present
+    if (roomAlias.startsWith("room/")) {
+      roomAlias = roomAlias.substring("room/".length);
+    }
+    // Add "#", if not present
+    if (!roomAlias.startsWith("#")) {
+      roomAlias = `#${roomAlias}`;
+    }
+  } else {
+    roomAlias = hash;
+  }
+
+  // Delete "?" and what comes afterwards
+  roomAlias = roomAlias.split("?")[0];
+
+  if (roomAlias.length <= 1) {
+    // Make roomAlias is null, if it only is a "#"
+    roomAlias = null;
+  } else {
+    // Add server part, if not present
+    if (!roomAlias.includes(":")) {
+      roomAlias = `${roomAlias}:${Config.defaultServerName()}`;
+    }
+  }
+
+  const parser = new ParamParser(search, hash);
+
+  // Make sure roomId is valid
+  let roomId: string | null = parser.getParam("roomId");
+  if (!roomId?.startsWith("!")) {
+    roomId = null;
+  } else if (!roomId.includes("")) {
+    roomId = null;
+  }
+
+  return {
+    roomAlias,
+    roomId,
+    viaServers: parser.getAllParams("viaServers"),
+  };
+}
+
+export const useRoomIdentifier = (): RoomIdentifier => {
+  const { pathname, search, hash } = useLocation();
+  return useMemo(
+    () => getRoomIdentifierFromUrl(pathname, search, hash),
+    [pathname, search, hash]
+  );
+};

src/UserMenu.module.css

@@ -17,22 +17,10 @@ limitations under the License.
 .menuIcon {
   width: 24px;
   height: 24px;
+
+  flex-shrink: 0;
 }
 
 .userButton svg * {
-  fill: var(--primary-content);
+  fill: var(--cpd-color-icon-primary);
-}
-
-.avatar {
-  width: 24px;
-  height: 24px;
-  font-size: var(--font-size-caption);
-}
-
-@media (min-width: 800px) {
-  .avatar {
-    width: 32px;
-    height: 32px;
-    font-size: var(--font-size-body);
-  }
 }

src/UserMenu.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022 - 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useCallback, useMemo } from "react";
+import { useCallback, useMemo } from "react";
 import { Item } from "@react-stately/collections";
 import { useLocation } from "react-router-dom";
 import { useTranslation } from "react-i18next";
@@ -25,6 +25,7 @@ import { Menu } from "./Menu";
 import { TooltipTrigger } from "./Tooltip";
 import { Avatar, Size } from "./Avatar";
 import { ReactComponent as UserIcon } from "./icons/User.svg";
+import { ReactComponent as SettingsIcon } from "./icons/Settings.svg";
 import { ReactComponent as LoginIcon } from "./icons/Login.svg";
 import { ReactComponent as LogoutIcon } from "./icons/Logout.svg";
 import { Body } from "./typography/Typography";
@@ -34,8 +35,9 @@ interface UserMenuProps {
   preventNavigation: boolean;
   isAuthenticated: boolean;
   isPasswordlessUser: boolean;
+  userId: string;
   displayName: string;
-  avatarUrl: string;
+  avatarUrl?: string;
   onAction: (value: string) => void;
 }
 
@@ -43,6 +45,7 @@ export function UserMenu({
   preventNavigation,
   isAuthenticated,
   isPasswordlessUser,
+  userId,
   displayName,
   avatarUrl,
   onAction,
@@ -58,6 +61,12 @@ export function UserMenu({
         key: "user",
         icon: UserIcon,
         label: displayName,
+        dataTestid: "usermenu_user",
+      });
+      arr.push({
+        key: "settings",
+        icon: SettingsIcon,
+        label: t("Settings"),
       });
 
       if (isPasswordlessUser && !preventNavigation) {
@@ -65,6 +74,7 @@ export function UserMenu({
           key: "login",
           label: t("Sign in"),
           icon: LoginIcon,
+          dataTestid: "usermenu_login",
         });
       }
 
@@ -73,6 +83,7 @@ export function UserMenu({
           key: "logout",
           label: t("Sign out"),
           icon: LogoutIcon,
+          dataTestid: "usermenu_logout",
         });
       }
     }
@@ -93,29 +104,41 @@ export function UserMenu({
   return (
     <PopoverMenuTrigger placement="bottom right">
       <TooltipTrigger tooltip={tooltip} placement="bottom left">
-        <Button variant="icon" className={styles.userButton}>
+        <Button
+          variant="icon"
+          className={styles.userButton}
+          data-testid="usermenu_open"
+        >
           {isAuthenticated && (!isPasswordlessUser || avatarUrl) ? (
             <Avatar
+              id={userId}
+              name={displayName}
               size={Size.SM}
-              className={styles.avatar}
               src={avatarUrl}
-              fallback={displayName.slice(0, 1).toUpperCase()}
             />
           ) : (
             <UserIcon />
           )}
         </Button>
       </TooltipTrigger>
-      {(props) => (
+      {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (props: any) => (
           <Menu {...props} label={t("User menu")} onAction={onAction}>
-          {items.map(({ key, icon: Icon, label }) => (
+            {items.map(({ key, icon: Icon, label, dataTestid }) => (
               <Item key={key} textValue={label}>
-              <Icon width={24} height={24} className={styles.menuIcon} />
+                <Icon
+                  width={24}
+                  height={24}
+                  className={styles.menuIcon}
+                  data-testid={dataTestid}
+                />
                 <Body overflowEllipsis>{label}</Body>
               </Item>
             ))}
           </Menu>
-      )}
+        )
+      }
     </PopoverMenuTrigger>
   );
 }

src/UserMenuContainer.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022 - 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useCallback } from "react";
+import { useCallback, useState } from "react";
 import { useHistory, useLocation } from "react-router-dom";
 
-import { useClient } from "./ClientContext";
+import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
-import { useModalTriggerState } from "./Modal";
+import { SettingsModal } from "./settings/SettingsModal";
-import { ProfileModal } from "./profile/ProfileModal";
 import { UserMenu } from "./UserMenu";
 
 interface Props {
@@ -30,41 +29,58 @@ interface Props {
 export function UserMenuContainer({ preventNavigation = false }: Props) {
   const location = useLocation();
   const history = useHistory();
-  const { isAuthenticated, isPasswordlessUser, logout, userName, client } =
+  const { client, logout, authenticated, passwordlessUser } = useClientLegacy();
-    useClient();
   const { displayName, avatarUrl } = useProfile(client);
-  const { modalState, modalProps } = useModalTriggerState();
+  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
+  const onDismissSettingsModal = useCallback(
+    () => setSettingsModalOpen(false),
+    [setSettingsModalOpen]
+  );
+
+  const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
 
   const onAction = useCallback(
-    (value: string) => {
+    async (value: string) => {
       switch (value) {
         case "user":
-          modalState.open();
+          setDefaultSettingsTab("profile");
+          setSettingsModalOpen(true);
+          break;
+        case "settings":
+          setDefaultSettingsTab("audio");
+          setSettingsModalOpen(true);
           break;
         case "logout":
-          logout();
+          logout?.();
           break;
         case "login":
           history.push("/login", { state: { from: location } });
           break;
       }
     },
-    [history, location, logout, modalState]
+    [history, location, logout, setSettingsModalOpen]
   );
 
+  const userName = client?.getUserIdLocalpart() ?? "";
   return (
     <>
       <UserMenu
         preventNavigation={preventNavigation}
-        isAuthenticated={isAuthenticated}
+        isAuthenticated={authenticated}
-        isPasswordlessUser={isPasswordlessUser}
+        isPasswordlessUser={passwordlessUser}
         avatarUrl={avatarUrl}
         onAction={onAction}
-        displayName={
+        userId={client?.getUserId() ?? ""}
-          displayName || (userName ? userName.replace("@", "") : undefined)
+        displayName={displayName || (userName ? userName.replace("@", "") : "")}
-        }
       />
-      {modalState.isOpen && <ProfileModal client={client} {...modalProps} />}
+      {client && (
+        <SettingsModal
+          client={client}
+          defaultTab={defaultSettingsTab}
+          open={settingsModalOpen}
+          onDismiss={onDismissSettingsModal}
+        />
+      )}
     </>
   );
 }

src/analytics/AnalyticsNotice.tsx

@@ -0,0 +1,14 @@
+import { FC } from "react";
+import { Trans } from "react-i18next";
+
+import { Link } from "../typography/Typography";
+
+export const AnalyticsNotice: FC = () => (
+  <Trans>
+    By participating in this beta, you consent to the collection of anonymous
+    data, which we use to improve the product. You can find more information
+    about which data we track in our{" "}
+    <Link href="https://element.io/privacy">Privacy Policy</Link> and our{" "}
+    <Link href="https://element.io/cookie-policy">Cookie Policy</Link>.
+  </Trans>
+);

src/analytics/AnalyticsOptInDescription.tsx

@@ -1,20 +0,0 @@
-import { t } from "i18next";
-import React from "react";
-
-import { Link } from "../typography/Typography";
-
-export const optInDescription: () => JSX.Element = () => {
-  return (
-    <>
-      <>
-        {t(
-          "By ticking this box you consent to the collection of anonymous data, which we use to improve your experience. You can find more information about which data we track in our "
-        )}
-      </>
-      <Link color="primary" href="https://element.io/privacy">
-        <>{t("Privacy Policy")}</>
-      </Link>
-      .
-    </>
-  );
-};

src/analytics/PosthogAnalytics.ts

@@ -20,7 +20,7 @@ import { MatrixClient } from "matrix-js-sdk";
 import { Buffer } from "buffer";
 
 import { widget } from "../widget";
-import { getSetting, setSetting, settingsBus } from "../settings/useSetting";
+import { getSetting, setSetting, getSettingKey } from "../settings/useSetting";
 import {
   CallEndedTracker,
   CallStartedTracker,
@@ -29,9 +29,12 @@ import {
   MuteCameraTracker,
   MuteMicrophoneTracker,
   UndecryptableToDeviceEventTracker,
+  QualitySurveyEventTracker,
+  CallDisconnectedEventTracker,
 } from "./PosthogEvents";
 import { Config } from "../config/Config";
 import { getUrlParams } from "../UrlParams";
+import { localStorageBus } from "../useLocalStorage";
 
 /* Posthog analytics tracking.
  *
@@ -69,6 +72,7 @@ export enum RegistrationType {
 interface PlatformProperties {
   appVersion: string;
   matrixBackend: "embedded" | "jssdk";
+  callBackend: "livekit" | "full-mesh";
 }
 
 interface PosthogSettings {
@@ -96,12 +100,16 @@ export class PosthogAnalytics {
   // set true during the constructor if posthog config is present, otherwise false
   private static internalInstance: PosthogAnalytics | null = null;
 
-  private identificationPromise: Promise<void>;
+  private identificationPromise?: Promise<void>;
   private readonly enabled: boolean = false;
   private anonymity = Anonymity.Disabled;
   private platformSuperProperties = {};
   private registrationType: RegistrationType = RegistrationType.Guest;
 
+  public static hasInstance(): boolean {
+    return Boolean(this.internalInstance);
+  }
+
   public static get instance(): PosthogAnalytics {
     if (!this.internalInstance) {
       this.internalInstance = new PosthogAnalytics(posthog);
@@ -186,6 +194,7 @@ export class PosthogAnalytics {
     return {
       appVersion,
       matrixBackend: widget ? "embedded" : "jssdk",
+      callBackend: "livekit",
     };
   }
 
@@ -227,7 +236,7 @@ export class PosthogAnalytics {
       .join("");
   }
 
-  public async identifyUser(analyticsIdGenerator: () => string) {
+  private async identifyUser(analyticsIdGenerator: () => string) {
     if (this.anonymity == Anonymity.Pseudonymous && this.enabled) {
       // Check the user's account_data for an analytics ID to use. Storing the ID in account_data allows
       // different devices to send the same ID.
@@ -248,7 +257,9 @@ export class PosthogAnalytics {
       } catch (e) {
         // The above could fail due to network requests, but not essential to starting the application,
         // so swallow it.
-        logger.log("Unable to identify user for tracking" + e.toString());
+        logger.log(
+          "Unable to identify user for tracking" + (e as Error)?.toString()
+        );
       }
       if (analyticsID) {
         this.posthog.identify(analyticsID);
@@ -319,7 +330,12 @@ export class PosthogAnalytics {
     this.setAnonymity(Anonymity.Disabled);
   }
 
-  public updateSuperProperties() {
+  public onLoginStatusChanged(): void {
+    const optInAnalytics = getSetting("opt-in-analytics", false);
+    this.updateAnonymityAndIdentifyUser(optInAnalytics);
+  }
+
+  private updateSuperProperties() {
     // Update super properties in posthog with our platform (app version, platform).
     // These properties will be subsequently passed in every event.
     //
@@ -339,7 +355,7 @@ export class PosthogAnalytics {
     return this.eventSignup.getSignupEndTime() > new Date(0);
   }
 
-  public async updateAnonymityAndIdentifyUser(
+  private async updateAnonymityAndIdentifyUser(
     pseudonymousOptIn: boolean
   ): Promise<void> {
     // Update this.anonymity based on the user's analytics opt-in settings
@@ -348,9 +364,13 @@ export class PosthogAnalytics {
       : Anonymity.Disabled;
     this.setAnonymity(anonymity);
 
+    // We may not yet have a Matrix client at this point, if not, bail. This should get
+    // triggered again by onLoginStatusChanged once we do have a client.
+    if (!window.matrixclient) return;
+
     if (anonymity === Anonymity.Pseudonymous) {
       this.setRegistrationType(
-        window.matrixclient.isGuest() || window.isPasswordlessUser
+        window.matrixclient.isGuest() || window.passwordlessUser
           ? RegistrationType.Guest
           : RegistrationType.Registered
       );
@@ -385,7 +405,7 @@ export class PosthogAnalytics {
     this.capture(eventName, properties, options);
   }
 
-  public startListeningToSettingsChanges(): void {
+  private startListeningToSettingsChanges(): void {
     // Listen to account data changes from sync so we can observe changes to relevant flags and update.
     // This is called -
     //  * On page load, when the account data is first received by sync
@@ -394,7 +414,7 @@ export class PosthogAnalytics {
     //  * When the user changes their preferences on this device
     // Note that for new accounts, pseudonymousAnalyticsOptIn won't be set, so updateAnonymityFromSettings
     // won't be called (i.e. this.anonymity will be left as the default, until the setting changes)
-    settingsBus.on("opt-in-analytics", (optInAnalytics) => {
+    localStorageBus.on(getSettingKey("opt-in-analytics"), (optInAnalytics) => {
       this.updateAnonymityAndIdentifyUser(optInAnalytics);
     });
   }
@@ -418,4 +438,6 @@ export class PosthogAnalytics {
   public eventMuteMicrophone = new MuteMicrophoneTracker();
   public eventMuteCamera = new MuteCameraTracker();
   public eventUndecryptableToDevice = new UndecryptableToDeviceEventTracker();
+  public eventQualitySurvey = new QualitySurveyEventTracker();
+  public eventCallDisconnected = new CallDisconnectedEventTracker();
 }

src/analytics/PosthogEvents.ts

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { DisconnectReason } from "livekit-client";
+
 import {
   IPosthogEvent,
   PosthogAnalytics,
@@ -163,3 +165,35 @@ export class UndecryptableToDeviceEventTracker {
     });
   }
 }
+
+interface QualitySurveyEvent {
+  eventName: "QualitySurvey";
+  callId: string;
+  feedbackText: string;
+  stars: number;
+}
+
+export class QualitySurveyEventTracker {
+  track(callId: string, feedbackText: string, stars: number) {
+    PosthogAnalytics.instance.trackEvent<QualitySurveyEvent>({
+      eventName: "QualitySurvey",
+      callId,
+      feedbackText,
+      stars,
+    });
+  }
+}
+
+interface CallDisconnectedEvent {
+  eventName: "CallDisconnected";
+  reason?: DisconnectReason;
+}
+
+export class CallDisconnectedEventTracker {
+  track(reason?: DisconnectReason) {
+    PosthogAnalytics.instance.trackEvent<CallDisconnectedEvent>({
+      eventName: "CallDisconnected",
+      reason,
+    });
+  }
+}

src/analytics/PosthogSpanProcessor.ts

@@ -0,0 +1,163 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  SpanProcessor,
+  ReadableSpan,
+  Span,
+} from "@opentelemetry/sdk-trace-base";
+import { hrTimeToMilliseconds } from "@opentelemetry/core";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { PosthogAnalytics } from "./PosthogAnalytics";
+
+interface PrevCall {
+  callId: string;
+  hangupTs: number;
+}
+
+/**
+ * The maximum time between hanging up and joining the same call that we would
+ * consider a 'rejoin' on the user's part.
+ */
+const maxRejoinMs = 2 * 60 * 1000; // 2 minutes
+
+/**
+ * Span processor that extracts certain metrics from spans to send to PostHog
+ */
+export class PosthogSpanProcessor implements SpanProcessor {
+  async forceFlush(): Promise<void> {}
+
+  onStart(span: Span): void {
+    // Hack: Yield to allow attributes to be set before processing
+    Promise.resolve().then(() => {
+      switch (span.name) {
+        case "matrix.groupCallMembership":
+          this.onGroupCallMembershipStart(span);
+          return;
+        case "matrix.groupCallMembership.summaryReport":
+          this.onSummaryReportStart(span);
+          return;
+      }
+    });
+  }
+
+  onEnd(span: ReadableSpan): void {
+    switch (span.name) {
+      case "matrix.groupCallMembership":
+        this.onGroupCallMembershipEnd(span);
+        return;
+    }
+  }
+
+  private get prevCall(): PrevCall | null {
+    // This is stored in localStorage so we can remember the previous call
+    // across app restarts
+    const data = localStorage.getItem("matrix-prev-call");
+    if (data === null) return null;
+
+    try {
+      return JSON.parse(data);
+    } catch (e) {
+      logger.warn("Invalid prev call data", data);
+      return null;
+    }
+  }
+
+  private set prevCall(data: PrevCall | null) {
+    localStorage.setItem("matrix-prev-call", JSON.stringify(data));
+  }
+
+  private onGroupCallMembershipStart(span: ReadableSpan): void {
+    const prevCall = this.prevCall;
+    const newCallId = span.attributes["matrix.confId"] as string;
+
+    // If the user joined the same call within a short time frame, log this as a
+    // rejoin. This is interesting as a call quality metric, since rejoins may
+    // indicate that users had to intervene to make the product work.
+    if (prevCall !== null && newCallId === prevCall.callId) {
+      const duration = hrTimeToMilliseconds(span.startTime) - prevCall.hangupTs;
+      if (duration <= maxRejoinMs) {
+        PosthogAnalytics.instance.trackEvent({
+          eventName: "Rejoin",
+          callId: prevCall.callId,
+          rejoinDuration: duration,
+        });
+      }
+    }
+  }
+
+  private onGroupCallMembershipEnd(span: ReadableSpan): void {
+    this.prevCall = {
+      callId: span.attributes["matrix.confId"] as string,
+      hangupTs: hrTimeToMilliseconds(span.endTime),
+    };
+  }
+
+  private onSummaryReportStart(span: ReadableSpan): void {
+    // Searching for an event like this:
+    //    matrix.stats.summary
+    //    matrix.stats.summary.percentageReceivedAudioMedia: 0.75
+    //    matrix.stats.summary.percentageReceivedMedia: 1
+    //    matrix.stats.summary.percentageReceivedVideoMedia: 0.75
+    //    matrix.stats.summary.maxJitter: 100
+    //    matrix.stats.summary.maxPacketLoss: 20
+    const event = span.events.find((e) => e.name === "matrix.stats.summary");
+    if (event !== undefined) {
+      const attributes = event.attributes;
+      if (attributes) {
+        const mediaReceived = `${attributes["matrix.stats.summary.percentageReceivedMedia"]}`;
+        const videoReceived = `${attributes["matrix.stats.summary.percentageReceivedVideoMedia"]}`;
+        const audioReceived = `${attributes["matrix.stats.summary.percentageReceivedAudioMedia"]}`;
+        const maxJitter = `${attributes["matrix.stats.summary.maxJitter"]}`;
+        const maxPacketLoss = `${attributes["matrix.stats.summary.maxPacketLoss"]}`;
+        const peerConnections = `${attributes["matrix.stats.summary.peerConnections"]}`;
+        const percentageConcealedAudio = `${attributes["matrix.stats.summary.percentageConcealedAudio"]}`;
+        const opponentUsersInCall = `${attributes["matrix.stats.summary.opponentUsersInCall"]}`;
+        const opponentDevicesInCall = `${attributes["matrix.stats.summary.opponentDevicesInCall"]}`;
+        const diffDevicesToPeerConnections = `${attributes["matrix.stats.summary.diffDevicesToPeerConnections"]}`;
+        const ratioPeerConnectionToDevices = `${attributes["matrix.stats.summary.ratioPeerConnectionToDevices"]}`;
+
+        PosthogAnalytics.instance.trackEvent(
+          {
+            eventName: "MediaReceived",
+            callId: span.attributes["matrix.confId"] as string,
+            mediaReceived: mediaReceived,
+            audioReceived: audioReceived,
+            videoReceived: videoReceived,
+            maxJitter: maxJitter,
+            maxPacketLoss: maxPacketLoss,
+            peerConnections: peerConnections,
+            percentageConcealedAudio: percentageConcealedAudio,
+            opponentUsersInCall: opponentUsersInCall,
+            opponentDevicesInCall: opponentDevicesInCall,
+            diffDevicesToPeerConnections: diffDevicesToPeerConnections,
+            ratioPeerConnectionToDevices: ratioPeerConnectionToDevices,
+          },
+          // Send instantly because the window might be closing
+          { send_instantly: true }
+        );
+      }
+    }
+  }
+
+  /**
+   * Shutdown the processor.
+   */
+  shutdown(): Promise<void> {
+    return Promise.resolve();
+  }
+}

src/analytics/RageshakeSpanProcessor.ts

@@ -0,0 +1,114 @@
+import { Attributes } from "@opentelemetry/api";
+import { hrTimeToMicroseconds } from "@opentelemetry/core";
+import {
+  SpanProcessor,
+  ReadableSpan,
+  Span,
+} from "@opentelemetry/sdk-trace-base";
+
+const dumpAttributes = (attr: Attributes) =>
+  Object.entries(attr).map(([key, value]) => ({
+    key,
+    type: typeof value,
+    value,
+  }));
+
+/**
+ * Exports spans on demand to the Jaeger JSON format, which can be attached to
+ * rageshakes and loaded into analysis tools like Jaeger and Stalk.
+ */
+export class RageshakeSpanProcessor implements SpanProcessor {
+  private readonly spans: ReadableSpan[] = [];
+
+  async forceFlush(): Promise<void> {}
+
+  onStart(span: Span): void {
+    this.spans.push(span);
+  }
+
+  onEnd(): void {}
+
+  /**
+   * Dumps the spans collected so far as Jaeger-compatible JSON.
+   */
+  public dump(): string {
+    const now = Date.now() * 1000; // Jaeger works in microseconds
+    const traces = new Map<string, ReadableSpan[]>();
+
+    // Organize spans by their trace IDs
+    for (const span of this.spans) {
+      const traceId = span.spanContext().traceId;
+      let trace = traces.get(traceId);
+
+      if (trace === undefined) {
+        trace = [];
+        traces.set(traceId, trace);
+      }
+
+      trace.push(span);
+    }
+
+    const processId = "p1";
+    const processes = {
+      [processId]: {
+        serviceName: "element-call",
+        tags: [],
+      },
+      warnings: null,
+    };
+
+    return JSON.stringify({
+      // Honestly not sure what some of these fields mean, I just know that
+      // they're present in Jaeger JSON exports
+      total: 0,
+      limit: 0,
+      offset: 0,
+      errors: null,
+      data: [...traces.entries()].map(([traceId, spans]) => ({
+        traceID: traceId,
+        warnings: null,
+        processes,
+        spans: spans.map((span) => {
+          const ctx = span.spanContext();
+          const startTime = hrTimeToMicroseconds(span.startTime);
+          // If the span has not yet ended, pretend that it ends now
+          const duration =
+            span.duration[0] === -1
+              ? now - startTime
+              : hrTimeToMicroseconds(span.duration);
+
+          return {
+            traceID: traceId,
+            spanID: ctx.spanId,
+            operationName: span.name,
+            processID: processId,
+            warnings: null,
+            startTime,
+            duration,
+            references:
+              span.parentSpanId === undefined
+                ? []
+                : [
+                    {
+                      refType: "CHILD_OF",
+                      traceID: traceId,
+                      spanID: span.parentSpanId,
+                    },
+                  ],
+            tags: dumpAttributes(span.attributes),
+            logs: span.events.map((event) => ({
+              timestamp: hrTimeToMicroseconds(event.time),
+              // The name of the event is in the "event" field, aparently.
+              fields: [
+                ...dumpAttributes(event.attributes ?? {}),
+                { key: "event", type: "string", value: event.name },
+              ],
+            })),
+          };
+        }),
+      })),
+    });
+  }
+
+  async shutdown(): Promise<void> {}
+}

src/array-utils.ts

@@ -0,0 +1,44 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Gets the index of the last element in the array to satsify the given
+ * predicate.
+ */
+// TODO: remove this once TypeScript recognizes the existence of
+// Array.prototype.findLastIndex
+export function findLastIndex<T>(
+  array: T[],
+  predicate: (item: T, index: number) => boolean
+): number | null {
+  for (let i = array.length - 1; i >= 0; i--) {
+    if (predicate(array[i], i)) return i;
+  }
+
+  return null;
+}
+
+/**
+ * Counts the number of elements in an array that satsify the given predicate.
+ */
+export const count = <T>(
+  array: T[],
+  predicate: (item: T, index: number) => boolean
+): number =>
+  array.reduce(
+    (acc, item, index) => (predicate(item, index) ? acc + 1 : acc),
+    0
+  );

src/auth/LoginPage.module.css

@@ -81,7 +81,7 @@ limitations under the License.
 }
 
 .authLinks a {
-  color: var(--accent);
+  color: var(--cpd-color-text-action-accent);
   text-decoration: none;
   font-weight: normal;
 }

src/auth/LoginPage.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { FC, FormEvent, useCallback, useRef, useState } from "react";
+import { FC, FormEvent, useCallback, useRef, useState } from "react";
 import { useHistory, useLocation, Link } from "react-router-dom";
 import { Trans, useTranslation } from "react-i18next";
 
@@ -35,8 +35,8 @@ export const LoginPage: FC = () => {
   const { setClient } = useClient();
   const login = useInteractiveLogin();
   const homeserver = Config.defaultHomeserverUrl(); // TODO: Make this configurable
-  const usernameRef = useRef<HTMLInputElement>();
+  const usernameRef = useRef<HTMLInputElement>(null);
-  const passwordRef = useRef<HTMLInputElement>();
+  const passwordRef = useRef<HTMLInputElement>(null);
   const history = useHistory();
   const location = useLocation();
   const [loading, setLoading] = useState(false);
@@ -49,12 +49,27 @@ export const LoginPage: FC = () => {
       e.preventDefault();
       setLoading(true);
 
+      if (!homeserver || !usernameRef.current || !passwordRef.current) {
+        setError(Error("Login parameters are undefined"));
+        setLoading(false);
+        return;
+      }
+
       login(homeserver, usernameRef.current.value, passwordRef.current.value)
         .then(([client, session]) => {
-          setClient(client, session);
+          if (!setClient) {
+            return;
+          }
 
-          if (location.state && location.state.from) {
+          setClient({ client, session });
-            history.push(location.state.from);
+
+          const locationState = location.state;
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          if (locationState && locationState.from) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            history.push(locationState.from);
           } else {
             history.push("/");
           }
@@ -88,6 +103,7 @@ export const LoginPage: FC = () => {
                   autoCapitalize="none"
                   prefix="@"
                   suffix={`:${Config.defaultServerName()}`}
+                  data-testid="login_username"
                 />
               </FieldRow>
               <FieldRow>
@@ -96,6 +112,7 @@ export const LoginPage: FC = () => {
                   ref={passwordRef}
                   placeholder={t("Password")}
                   label={t("Password")}
+                  data-testid="login_password"
                 />
               </FieldRow>
               {error && (
@@ -104,7 +121,11 @@ export const LoginPage: FC = () => {
                 </FieldRow>
               )}
               <FieldRow>
-                <Button type="submit" disabled={loading}>
+                <Button
+                  type="submit"
+                  disabled={loading}
+                  data-testid="login_login"
+                >
                   {loading ? t("Logging in…") : t("Login")}
                 </Button>
               </FieldRow>

src/auth/RegisterPage.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {
+import {
   ChangeEvent,
   FC,
   FormEvent,
@@ -30,7 +30,7 @@ import { Trans, useTranslation } from "react-i18next";
 
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
 import { Button } from "../button";
-import { useClient } from "../ClientContext";
+import { useClientLegacy } from "../ClientContext";
 import { useInteractiveRegistration } from "./useInteractiveRegistration";
 import styles from "./LoginPage.module.css";
 import { ReactComponent as Logo } from "../icons/LogoLarge.svg";
@@ -45,17 +45,17 @@ export const RegisterPage: FC = () => {
   const { t } = useTranslation();
   usePageTitle(t("Register"));
 
-  const { loading, isAuthenticated, isPasswordlessUser, client, setClient } =
+  const { loading, authenticated, passwordlessUser, client, setClient } =
-    useClient();
+    useClientLegacy();
-  const confirmPasswordRef = useRef<HTMLInputElement>();
+
+  const confirmPasswordRef = useRef<HTMLInputElement>(null);
   const history = useHistory();
   const location = useLocation();
   const [registering, setRegistering] = useState(false);
   const [error, setError] = useState<Error>();
   const [password, setPassword] = useState("");
   const [passwordConfirmation, setPasswordConfirmation] = useState("");
-  const [privacyPolicyUrl, recaptchaKey, register] =
+  const { recaptchaKey, register } = useInteractiveRegistration();
-    useInteractiveRegistration();
   const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);
 
   const onSubmitRegisterForm = useCallback(
@@ -76,10 +76,11 @@ export const RegisterPage: FC = () => {
           userName,
           password,
           userName,
-          recaptchaResponse
+          recaptchaResponse,
+          passwordlessUser
         );
 
-        if (client && isPasswordlessUser) {
+        if (client && client?.groupCallEventHandler && passwordlessUser) {
           // Migrate the user's rooms
           for (const groupCall of client.groupCallEventHandler.groupCalls.values()) {
             const roomId = groupCall.room.roomId;
@@ -87,7 +88,11 @@ export const RegisterPage: FC = () => {
             try {
               await newClient.joinRoom(roomId);
             } catch (error) {
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
               if (error.errcode === "M_LIMIT_EXCEEDED") {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
                 await sleep(error.data.retry_after_ms);
                 await newClient.joinRoom(roomId);
               } else {
@@ -98,13 +103,17 @@ export const RegisterPage: FC = () => {
           }
         }
 
-        setClient(newClient, session);
+        setClient?.({ client: newClient, session });
         PosthogAnalytics.instance.eventSignup.cacheSignupEnd(new Date());
       };
 
       submit()
         .then(() => {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
           if (location.state?.from) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             history.push(location.state?.from);
           } else {
             history.push("/");
@@ -120,7 +129,7 @@ export const RegisterPage: FC = () => {
       register,
       location,
       history,
-      isPasswordlessUser,
+      passwordlessUser,
       reset,
       execute,
       client,
@@ -137,10 +146,10 @@ export const RegisterPage: FC = () => {
   }, [password, passwordConfirmation, t]);
 
   useEffect(() => {
-    if (!loading && isAuthenticated && !isPasswordlessUser && !registering) {
+    if (!loading && authenticated && !passwordlessUser && !registering) {
       history.push("/");
     }
-  }, [loading, history, isAuthenticated, isPasswordlessUser, registering]);
+  }, [loading, history, authenticated, passwordlessUser, registering]);
 
   if (loading) {
     return <LoadingView />;
@@ -166,6 +175,7 @@ export const RegisterPage: FC = () => {
                   autoCapitalize="none"
                   prefix="@"
                   suffix={`:${Config.defaultServerName()}`}
+                  data-testid="register_username"
                 />
               </FieldRow>
               <FieldRow>
@@ -179,6 +189,7 @@ export const RegisterPage: FC = () => {
                   value={password}
                   placeholder={t("Password")}
                   label={t("Password")}
+                  data-testid="register_password"
                 />
               </FieldRow>
               <FieldRow>
@@ -193,6 +204,7 @@ export const RegisterPage: FC = () => {
                   placeholder={t("Confirm password")}
                   label={t("Confirm password")}
                   ref={confirmPasswordRef}
+                  data-testid="register_confirm_password"
                 />
               </FieldRow>
               <Caption>
@@ -208,7 +220,9 @@ export const RegisterPage: FC = () => {
                   apply.
                   <br />
                   By clicking "Register", you agree to our{" "}
-                  <Link href={privacyPolicyUrl}>Terms and conditions</Link>
+                  <Link href={Config.get().eula}>
+                    End User Licensing Agreement (EULA)
+                  </Link>
                 </Trans>
               </Caption>
               {error && (
@@ -217,7 +231,11 @@ export const RegisterPage: FC = () => {
                 </FieldRow>
               )}
               <FieldRow>
-                <Button type="submit" disabled={registering}>
+                <Button
+                  type="submit"
+                  disabled={registering}
+                  data-testid="register_register"
+                >
                   {registering ? t("Registering…") : t("Register")}
                 </Button>
               </FieldRow>

src/auth/useInteractiveLogin.ts

@@ -41,8 +41,10 @@ export const useInteractiveLogin = () =>
           },
           password,
         }),
-      stateUpdated: null,
+      stateUpdated: (...args) => {},
-      requestEmailToken: null,
+      requestEmailToken: (...args): Promise<{ sid: string }> => {
+        return Promise.resolve({ sid: "" });
+      },
     });
 
     // XXX: This claims to return an IAuthData which contains none of these

src/auth/useInteractiveRegistration.ts

@@ -22,29 +22,33 @@ import { initClient } from "../matrix-utils";
 import { Session } from "../ClientContext";
 import { Config } from "../config/Config";
 
-export const useInteractiveRegistration = (): [
+export const useInteractiveRegistration = (): {
-  string,
+  privacyPolicyUrl?: string;
-  string,
+  recaptchaKey?: string;
-  (
+  register: (
     username: string,
     password: string,
     displayName: string,
     recaptchaResponse: string,
-    passwordlessUser?: boolean
+    passwordlessUser: boolean
-  ) => Promise<[MatrixClient, Session]>
+  ) => Promise<[MatrixClient, Session]>;
-] => {
+} => {
-  const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string>();
+  const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string | undefined>(
-  const [recaptchaKey, setRecaptchaKey] = useState<string>();
+    undefined
+  );
+  const [recaptchaKey, setRecaptchaKey] = useState<string | undefined>(
+    undefined
+  );
 
   const authClient = useRef<MatrixClient>();
   if (!authClient.current) {
     authClient.current = createClient({
-      baseUrl: Config.defaultHomeserverUrl(),
+      baseUrl: Config.defaultHomeserverUrl()!,
     });
   }
 
   useEffect(() => {
-    authClient.current.registerRequest({}).catch((error) => {
+    authClient.current!.registerRequest({}).catch((error) => {
       setPrivacyPolicyUrl(
         error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url
       );
@@ -58,12 +62,12 @@ export const useInteractiveRegistration = (): [
       password: string,
       displayName: string,
       recaptchaResponse: string,
-      passwordlessUser?: boolean
+      passwordlessUser: boolean
     ): Promise<[MatrixClient, Session]> => {
       const interactiveAuth = new InteractiveAuth({
-        matrixClient: authClient.current,
+        matrixClient: authClient.current!,
         doRequest: (auth) =>
-          authClient.current.registerRequest({
+          authClient.current!.registerRequest({
             username,
             password,
             auth: auth || undefined,
@@ -84,7 +88,9 @@ export const useInteractiveRegistration = (): [
             });
           }
         },
-        requestEmailToken: null,
+        requestEmailToken: (...args) => {
+          return Promise.resolve({ sid: "dummy" });
+        },
       });
 
       // XXX: This claims to return an IAuthData which contains none of these
@@ -95,7 +101,7 @@ export const useInteractiveRegistration = (): [
 
       const client = await initClient(
         {
-          baseUrl: Config.defaultHomeserverUrl(),
+          baseUrl: Config.defaultHomeserverUrl()!,
           accessToken: access_token,
           userId: user_id,
           deviceId: device_id,
@@ -117,7 +123,7 @@ export const useInteractiveRegistration = (): [
         session.tempPassword = password;
       }
 
-      const user = client.getUser(client.getUserId());
+      const user = client.getUser(client.getUserId()!)!;
       user.setRawDisplayName(displayName);
       user.setDisplayName(displayName);
 
@@ -126,5 +132,5 @@ export const useInteractiveRegistration = (): [
     []
   );
 
-  return [privacyPolicyUrl, recaptchaKey, register];
+  return { privacyPolicyUrl, recaptchaKey, register };
 };

src/auth/useRecaptcha.ts

@@ -34,7 +34,7 @@ interface RecaptchaPromiseRef {
   reject: (error: Error) => void;
 }
 
-export const useRecaptcha = (sitekey: string) => {
+export const useRecaptcha = (sitekey?: string) => {
   const { t } = useTranslation();
   const [recaptchaId] = useState(() => randomString(16));
   const promiseRef = useRef<RecaptchaPromiseRef>();
@@ -68,9 +68,9 @@ export const useRecaptcha = (sitekey: string) => {
     }
   }, [recaptchaId, sitekey]);
 
-  const execute = useCallback(() => {
+  const execute = useCallback((): Promise<string> => {
     if (!sitekey) {
-      return Promise.resolve(null);
+      return Promise.resolve("");
     }
 
     if (!window.grecaptcha) {

src/auth/useRegisterPasswordlessUser.ts

@@ -22,20 +22,24 @@ import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
 import { generateRandomName } from "../auth/generateRandomName";
 import { useRecaptcha } from "../auth/useRecaptcha";
 
-export interface UseRegisterPasswordlessUserType {
+interface UseRegisterPasswordlessUserType {
-  privacyPolicyUrl: string;
+  privacyPolicyUrl?: string;
   registerPasswordlessUser: (displayName: string) => Promise<void>;
-  recaptchaId: string;
+  recaptchaId?: string;
 }
 
 export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
   const { setClient } = useClient();
-  const [privacyPolicyUrl, recaptchaKey, register] =
+  const { privacyPolicyUrl, recaptchaKey, register } =
     useInteractiveRegistration();
   const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);
 
   const registerPasswordlessUser = useCallback(
     async (displayName: string) => {
+      if (!setClient) {
+        throw new Error("No client context");
+      }
+
       try {
         const recaptchaResponse = await execute();
         const userName = generateRandomName();
@@ -46,7 +50,7 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
           recaptchaResponse,
           true
         );
-        setClient(client, session);
+        setClient({ client, session });
       } catch (e) {
         reset();
         throw e;