Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18

# Conflicts: # Config/AppIdentifiers.xcconfig # Config/AppVersion.xcconfig # Podfile # Podfile.lock # Riot/Assets/de.lproj/Vector.strings # Riot/Generated/Images.swift # Riot/Modules/Analytics/DecryptionFailureTracker.m # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Onboarding/OnboardingCoordinator.swift # Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift # Riot/Modules/Room/RoomViewController.m # Riot/SupportingFiles/Info.plist # Riot/Utils/EventFormatter.m # Riot/Utils/Tools.h # Riot/Utils/Tools.m # Riot/target.yml # RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift # fastlane/Fastfile # project.yml
2026-04-17 23:18:27 +02:00 · 2022-06-12 19:49:46 +02:00
parent 8fc4d98971 63ae6d06ab
commit 1ab51f37f8
533 changed files with 25776 additions and 3058 deletions
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -16,7 +16,7 @@ env:
 jobs:
  build:
    name: Build
-    runs-on: macos-11
+    runs-on: macos-12
    
    # Concurrency group not needed as this workflow only runs on develop which we always want to test.

@@ -44,10 +44,12 @@ jobs:

      # Common setup
      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
      - name: Bundle install
        run: |
          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
+          bundle install --jobs 4 --retry 3
      - name: Use right MatrixSDK versions
        run: bundle exec fastlane point_dependencies_to_related_branches

--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -17,7 +17,7 @@ env:
 jobs:
  tests:
    name: Tests
-    runs-on: macos-11
+    runs-on: macos-12
    
    concurrency:
      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
@@ -49,10 +49,12 @@ jobs:

      # Common setup
      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
      - name: Bundle install
        run: |
          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
+          bundle install --jobs 4 --retry 3
      - name: Use right MatrixSDK versions
        run: bundle exec fastlane point_dependencies_to_related_branches

--- a/.github/workflows/ci-ui-tests.yml
+++ b/.github/workflows/ci-ui-tests.yml
@@ -0,0 +1,59 @@
+name: UI Tests CI
+
+on:
+  # Triggers the workflow on any pull request
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  # Make the git branch for a PR available to our Fastfile
+  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
+
+jobs:
+  tests:
+    name: UI Tests
+    runs-on: macos-12
+    
+    concurrency:
+      # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ui-tests-${{ github.head_ref }}
+      cancel-in-progress: true
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - uses: actions/cache@v2
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      # Make sure we use the latest version of MatrixSDK
+      - name: Reset MatrixSDK pod
+        run: rm -rf Pods/MatrixSDK
+
+      # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Use right MatrixSDK versions
+        run: bundle exec fastlane point_dependencies_to_related_branches
+
+      # Main step
+      - name: UI tests
+        run: bundle exec fastlane uitest
--- a/.github/workflows/release-alpha.yml
+++ b/.github/workflows/release-alpha.yml
@@ -15,7 +15,7 @@ env:

 jobs:
  check-secret:
-    runs-on: macos-11
+    runs-on: macos-12
    outputs:
      out-key: ${{ steps.out-key.outputs.defined }}
    steps:
@@ -26,11 +26,11 @@ jobs:
          if: "${{ env.P12_KEY != '' || env.P12_PASSWORD_KEY != '' }}"
          run: echo "::set-output name=defined::true"
  build:
-    # Run job if secrets are avilable (not avaiable for forks).
+    # Run job if secrets are available (not available for forks).
    needs: [check-secret]
    if: needs.check-secret.outputs.out-key == 'true'
    name: Release
-    runs-on: macos-11
+    runs-on: macos-12
    
    concurrency:
      # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -64,11 +64,12 @@ jobs:

      # Common setup
      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
      - name: Bundle install
        run: |
          bundle config path vendor/bundle
          bundle install --jobs 4 --retry 3
-
      - name: Use right MatrixSDK versions
        run: bundle exec fastlane point_dependencies_to_related_branches

@@ -85,7 +86,7 @@ jobs:
      - name: Build Ad-hoc release and send it to Diawi
        run: bundle exec fastlane alpha
        env:
-          # Automaticaly bypass 2FA upgrade if possible on Apple account.
+          # Automatically bypass 2FA upgrade if possible on Apple account.
          SPACESHIP_SKIP_2FA_UPGRADE: true
          APPLE_ID: ${{ secrets.FASTLANE_USER }}
          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -9,16 +9,15 @@ jobs:
    name: Add Z-Labs label for features behind labs flags
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'A-Maths') || 
-        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
-        contains(github.event.issue.labels.*.name, 'A-Polls') ||
-        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
-        contains(github.event.issue.labels.*.name, 'Z-IA') ||
-        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-        contains(github.event.issue.labels.*.name, 'A-Tags')
+      contains(github.event.issue.labels.*.name, 'A-Maths') || 
+      contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
+      contains(github.event.issue.labels.*.name, 'Z-IA') ||
+      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
+      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+      contains(github.event.issue.labels.*.name, 'A-Tags')
    steps:
      - uses: actions/github-script@v5
        with:
@@ -45,14 +44,14 @@ jobs:
    name: P1 X-Needs-Design to Design project board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-        (contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent'))
    steps:
      - uses: octokit/graphql-action@v2.x
        id: add_to_project
@@ -76,7 +75,7 @@ jobs:
    name: X-Needs-Product to Design project board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'X-Needs-Product')
+      contains(github.event.issue.labels.*.name, 'X-Needs-Product')
    steps:
      - uses: octokit/graphql-action@v2.x
        id: add_to_project
@@ -100,10 +99,7 @@ jobs:
    name: Spaces issues to Delight project board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
-        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
-        contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
-        contains(github.event.issue.labels.*.name, 'Z-IA')
+        contains(github.event.issue.labels.*.name, 'Team: Delight')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
@@ -126,7 +122,7 @@ jobs:
    name: A-Voice Messages to voice message board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'A-Voice Messages')
+      contains(github.event.issue.labels.*.name, 'A-Voice Messages')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
@@ -149,7 +145,7 @@ jobs:
    name: A-Threads to Thread board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'A-Threads')
+      contains(github.event.issue.labels.*.name, 'A-Threads')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
@@ -172,7 +168,7 @@ jobs:
    name: A-Message-Bubbles to Message bubble board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
@@ -195,7 +191,7 @@ jobs:
    name: Z-FTUE to FTUE board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'Z-FTUE')
+      contains(github.event.issue.labels.*.name, 'Z-FTUE')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
@@ -213,12 +209,12 @@ jobs:
        env:
          PROJECT_ID: "PN_kwDOAM0swc4AAqVx"
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-          
+
  move_WTF_issues:
    name: Z-WTF to WTF board
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'Z-WTF')
+      contains(github.event.issue.labels.*.name, 'Z-WTF')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -8,22 +8,19 @@ jobs:
  p1_issues_to_team_workboard:
    runs-on: ubuntu-latest
    if: >
-        (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
-         !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
-         !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
-         !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
-        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
-         contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+      (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
+       !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
+       !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
+       !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
+       !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
+      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+       contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent'))
    steps:
      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
        with:
@@ -34,20 +31,20 @@ jobs:
  P1_issues_to_crypto_team_workboard:
    runs-on: ubuntu-latest
    if: >
-        contains(github.event.issue.labels.*.name, 'Z-UISI') ||
-        (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
-        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
-         contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+      contains(github.event.issue.labels.*.name, 'Z-UISI') ||
+      (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+       contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent'))
    steps:
      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
        with:
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+brew "xcodegen"
+brew "mint"
--- a/Brewfile.lock.json
+++ b/Brewfile.lock.json
@@ -0,0 +1,91 @@
+{
+  "entries": {
+    "brew": {
+      "xcodegen": {
+        "version": "2.28.0",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17",
+              "sha256": "fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17"
+            },
+            "arm64_big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210",
+              "sha256": "54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210"
+            },
+            "monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169",
+              "sha256": "261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169"
+            },
+            "big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da",
+              "sha256": "24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da"
+            },
+            "catalina": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd",
+              "sha256": "d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd"
+            }
+          }
+        }
+      },
+      "mint": {
+        "version": "0.17.1",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc",
+              "sha256": "1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc"
+            },
+            "arm64_big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e",
+              "sha256": "c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e"
+            },
+            "monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463",
+              "sha256": "5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463"
+            },
+            "big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02",
+              "sha256": "3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02"
+            },
+            "catalina": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e",
+              "sha256": "d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e"
+            },
+            "x86_64_linux": {
+              "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764",
+              "sha256": "1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764"
+            }
+          }
+        }
+      }
+    }
+  },
+  "system": {
+    "macos": {
+      "monterey": {
+        "HOMEBREW_VERSION": "3.4.8",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "c56787cde0b726d961c1949aca8548551133975e",
+        "CLT": "",
+        "Xcode": "13.3",
+        "macOS": "12.3.1"
+      }
+    }
+  }
+}
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,131 @@
+## Changes in 1.8.18 (2022-06-03)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.8)).
+- Show user indicators when paginating a room ([#5746](https://github.com/vector-im/element-ios/issues/5746))
+- Authentication: Display fallback screens on registration & login according to the HS needs. ([#6176](https://github.com/vector-im/element-ios/issues/6176))
+- WellKnown: support outbound keys presharing strategy ([#6214](https://github.com/vector-im/element-ios/issues/6214))
+
+🐛 Bugfixes
+
+- Location sharing: Improve automatic detection of pin drop state ([#6202](https://github.com/vector-im/element-ios/issues/6202))
+
+🧱 Build
+
+- Ensure that warnings from CocoaPods dependencies do not show up in Xcode ([#6196](https://github.com/vector-im/element-ios/pull/6196))
+- CI: Use macOS 12 and Xcode 13.4 ([#6204](https://github.com/vector-im/element-ios/pull/6204))
+
+🚧 In development 🚧
+
+- Authentication: Add the login screen to the new flow and support SSO on both login and registration flows. ([#5654](https://github.com/vector-im/element-ios/issues/5654))
+
+
+## Changes in 1.8.17 (2022-05-31)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)).
+- Location sharing: Add a spinner view for starting state in timeline cell ([#6101](https://github.com/vector-im/element-ios/issues/6101))
+- Location sharing: Add labs flag for live location sharing ([#6195](https://github.com/vector-im/element-ios/issues/6195))
+
+🐛 Bugfixes
+
+- Added attempt at fixing random crashes while calculating timeline cell heights. ([#6188](https://github.com/vector-im/element-ios/pull/6188))
+- Fix ITMS Warning on CFBundleDocumentTypes ([#6159](https://github.com/vector-im/element-ios/issues/6159))
+- RoomViewController: Fix confirmation for RTL overridden links. ([#6208](https://github.com/vector-im/element-ios/issues/6208))
+- Fix issue with mention pill avatar consuming tap gestures ([#6212](https://github.com/vector-im/element-ios/issues/6212))
+
+🚧 In development 🚧
+
+- Authentication: Add Email/Terms/ReCaptcha screens into the flow. ([#5151](https://github.com/vector-im/element-ios/issues/5151))
+- Authentication: Implement msisdn verification screen. ([#6182](https://github.com/vector-im/element-ios/issues/6182))
+- Location sharing: Support sending live device location. ([#5722](https://github.com/vector-im/element-ios/issues/5722))
+- Authentication: Implement the LoginWizard to match Element Android. ([#5896](https://github.com/vector-im/element-ios/issues/5896))
+- Location sharing: Support restarting location sending after app kill. ([#6199](https://github.com/vector-im/element-ios/issues/6199))
+
+
+## Changes in 1.8.16 (2022-05-19)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.6)).
+
+🐛 Bugfixes
+
+- Fixed home screen shrinking too much on opening the keyboard. ([#6184](https://github.com/vector-im/element-ios/pull/6184))
+- Fixed filtering search bar not resetting properly when cancelling or switching tabs. ([#6130](https://github.com/vector-im/element-ios/issues/6130))
+
+
+## Changes in 1.8.15 (2022-05-18)
+
+✨ Features
+
+- Allow video rooms to be shown in the rooms list. ([#6149](https://github.com/vector-im/element-ios/issues/6149))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.5)).
+- Add mention pills to timeline & composer ([#3526](https://github.com/vector-im/element-ios/issues/3526))
+- [Room settings] Hide or disable search in the encrypted rooms ([#5725](https://github.com/vector-im/element-ios/issues/5725))
+- ThreadRoomTitleView: Reduce spaces between title and room avatar & room name. ([#5878](https://github.com/vector-im/element-ios/issues/5878))
+- Analytics: Log decryption error details as context in AnalyticsEvent ([#6046](https://github.com/vector-im/element-ios/issues/6046))
+- Authentication: New user accounts are now tracked in analytics if the user opted in. ([#6074](https://github.com/vector-im/element-ios/issues/6074))
+- Location sharing: update UI to latest design ([#6162](https://github.com/vector-im/element-ios/issues/6162))
+
+🐛 Bugfixes
+
+- Fixed crash when opening rooms where the current user doesn't have permission to post messages. ([#6165](https://github.com/vector-im/element-ios/pull/6165))
+- Media gallery: Don't show a thumbnail for the hidden album. ([#6096](https://github.com/vector-im/element-ios/issues/6096))
+- Location sharing: fix bad interaction between static and live location cell ([#6099](https://github.com/vector-im/element-ios/issues/6099))
+- Location sharing: handle correctly timeline refresh after reception of beacon from live location sharing ([#6103](https://github.com/vector-im/element-ios/issues/6103))
+- Location sharing: fix stop button in timeline ([#6110](https://github.com/vector-im/element-ios/issues/6110))
+- Location sharing: handle correctly visibility of the live banner in room ([#6111](https://github.com/vector-im/element-ios/issues/6111))
+- Presence: fix live updates on Home & DM list ([#6144](https://github.com/vector-im/element-ios/issues/6144))
+- Stop deleting audio recording when sending fails. ([#6160](https://github.com/vector-im/element-ios/issues/6160))
+
+🚧 In development 🚧
+
+- Onboarding: Tidy up SwiftUI and Onboarding screens. ([#6139](https://github.com/vector-im/element-ios/pull/6139))
+- Onboarding: Rename completion to callback and simplify actor usage ([#6141](https://github.com/vector-im/element-ios/pull/6141))
+- Authentication: Create email verification screen. ([#5649](https://github.com/vector-im/element-ios/issues/5649))
+- Authentication: Create terms and ReCaptcha screens. ([#5650](https://github.com/vector-im/element-ios/issues/5650))
+
+
+## Changes in 1.8.14 (2022-05-05)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.4)).
+- Spaces: Bring leaving space experience in line with Web ([#4850](https://github.com/vector-im/element-ios/issues/4850))
+- Location sharing: Add cell for live location sharing in timeline ([#6029](https://github.com/vector-im/element-ios/issues/6029))
+- Location sharing: Add timer selector when start live location sharing ([#6071](https://github.com/vector-im/element-ios/issues/6071))
+- Location sharing: Connect SDK to location sharing timeline cell ([#6077](https://github.com/vector-im/element-ios/issues/6077))
+
+🐛 Bugfixes
+
+- RoomNavigationParameters: Fix initializer by not defining convenience. ([#5883](https://github.com/vector-im/element-ios/issues/5883))
+- Fail to open a sub space ([#5965](https://github.com/vector-im/element-ios/issues/5965))
+- RecentsViewController: Fix disappearing filter on search cancellation & empty view on the first screen appearing. ([#6076](https://github.com/vector-im/element-ios/issues/6076))
+- RoomsViewController: Avoid crash by fixing section index to scroll. ([#6086](https://github.com/vector-im/element-ios/issues/6086))
+- Search: Prevent crash when searching ([#6115](https://github.com/vector-im/element-ios/issues/6115))
+
+🗣 Translations
+
+- Localisations: Remove strings with bad formatting and add a run script to detect errors at compile time. ([#5990](https://github.com/vector-im/element-ios/issues/5990))
+
+🧱 Build
+
+- UI Tests: Fix broken tests and add a check on PRs. ([#6050](https://github.com/vector-im/element-ios/issues/6050))
+
+🚧 In development 🚧
+
+- Authentication: Begin implementing authentication flow with a Service, Registration screen and Server Selection screen. ([#5648](https://github.com/vector-im/element-ios/issues/5648))
+- Location sharing: Add live location viewer screen. ([#5723](https://github.com/vector-im/element-ios/issues/5723))
+- Location sharing: Support live location event in the timeline. ([#6057](https://github.com/vector-im/element-ios/issues/6057))
+- Location sharing: Integrate live location viewer screen with room screen. ([#6081](https://github.com/vector-im/element-ios/issues/6081))
+
+
 ## Changes in 1.8.13 (2022-04-20)

 ✨ Features
--- a/Config/AppIdentifiers.xcconfig
+++ b/Config/AppIdentifiers.xcconfig
@@ -1,6 +1,5 @@
 // 
 // Copyright 2021 Vector Creations Ltd
-// Copyright (c) 2021 BWI GmbH
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,28 +16,24 @@


 // App identity
-BUNDLE_DISPLAY_NAME = BwMessenger
-BASE_BUNDLE_IDENTIFIER = de.bwi.bwmessenger
-APPLICATION_GROUP_IDENTIFIER = group.de.bwmessenger
+BUNDLE_DISPLAY_NAME = Element
+BASE_BUNDLE_IDENTIFIER = im.vector.app
+APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element

-// Version
-MARKETING_VERSION = 1.21.0
-CURRENT_PROJECT_VERSION = 1.21.0
-
 // Team
-DEVELOPMENT_TEAM = Q111Q11QQ1
+DEVELOPMENT_TEAM = 7J4U792NQT


 // Provisioning profiles
 RIOT_PROVISIONING_PROFILE_SPECIFIER = Vector App Store
-RIOT_PROVISIONING_PROFILE = f65e7447-b8a3-46cc-8fba-fa60e55e2511
+RIOT_PROVISIONING_PROFILE = 7579fa6f-9887-415e-90fc-2c7acd8812e6

 NSE_PROVISIONING_PROFILE_SPECIFIER = "Vector NSE: App Store"
-NSE_PROVISIONING_PROFILE = 31dc9316-e029-47fd-81f5-778db07d76a2
+NSE_PROVISIONING_PROFILE = e73107b2-1bfe-4615-be3e-39fd4dcb2af0

 SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
-SHARE_EXTENSION_PROVISIONING_PROFILE =  1a3be143-50c7-4ae2-834e-00596a053141
+SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995

 SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
-SIRI_INTENTS_PROVISIONING_PROFILE = 18a66f93-ffe1-4008-b343-58350cc65023
+SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -16,5 +16,5 @@
 //

 // Version
-MARKETING_VERSION = 1.21.0
+MARKETING_VERSION = 1.22.0
 CURRENT_PROJECT_VERSION = 20220309075454
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -436,6 +436,7 @@ final class BuildSettings: NSObject {

    // MARK: - Onboarding
    static let onboardingShowAccountPersonalization = false
+    static let onboardingEnableNewAuthenticationFlow = false
    
    // MARK: - Secrets Recovery
    static let secretsRecoveryAllowReset = true
--- a/Config/Project.xcconfig
+++ b/Config/Project.xcconfig
@@ -25,10 +25,10 @@
 KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared

 // Build settings
-IPHONEOS_DEPLOYMENT_TARGET = 12.1
+IPHONEOS_DEPLOYMENT_TARGET = 14.0
 SDKROOT = iphoneos
 TARGETED_DEVICE_FAMILY = 1,2
-SWIFT_VERSION = 5.3.1
+SWIFT_VERSION = 5.6
 ENABLE_BITCODE = NO

 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
--- a/DesignKit/Source/ColorValues.swift
+++ b/DesignKit/Source/ColorValues.swift
@@ -46,5 +46,7 @@ public struct ColorValues: Colors {
    
    public let background: UIColor
    
+    public let ems: UIColor
+    
    public let namesAndAvatars: [UIColor]
 }
--- a/DesignKit/Source/Colors.swift
+++ b/DesignKit/Source/Colors.swift
@@ -55,7 +55,7 @@ public protocol Colors {
    /// Separating line
    var separator: ColorType { get }
    
-    //  Cards, tiles
+    /// Cards, tiles
    var tile: ColorType { get }
    
    /// Top navigation background on iOS
@@ -64,6 +64,9 @@ public protocol Colors {
    /// Background UI color
    var background: ColorType { get }
    
+    /// Global color: The EMS brand's purple colour.
+    var ems: ColorType { get }
+    
    /// - Names in chat timeline
    /// - Avatars default states that include first name letter
    var namesAndAvatars: [ColorType] { get }
--- a/DesignKit/Source/ColorsSwiftUI.swift
+++ b/DesignKit/Source/ColorsSwiftUI.swift
@@ -47,6 +47,8 @@ public struct ColorSwiftUI: Colors {
    
    public let background: Color
    
+    public var ems: Color
+    
    public let namesAndAvatars: [Color]
    
    init(values: ColorValues) {
@@ -62,6 +64,7 @@ public struct ColorSwiftUI: Colors {
        tile = Color(values.tile)
        navigation = Color(values.navigation)
        background = Color(values.background)
+        ems = Color(values.ems)
        namesAndAvatars = values.namesAndAvatars.map({ Color($0) })
    }
 }
--- a/DesignKit/Variants/Colors/Dark/DarkColors.swift
+++ b/DesignKit/Variants/Colors/Dark/DarkColors.swift
@@ -33,6 +33,7 @@ public class DarkColors {
        tile: UIColor(rgb:0x394049),
        navigation: UIColor(rgb:0x21262C),
        background: UIColor(rgb:0x15191E),
+        ems: UIColor(rgb: 0x7E69FF),
        namesAndAvatars: [
            UIColor(rgb:0x368BD6),
            UIColor(rgb:0xAC3BA8),
--- a/DesignKit/Variants/Colors/Light/LightColors.swift
+++ b/DesignKit/Variants/Colors/Light/LightColors.swift
@@ -34,6 +34,7 @@ public class LightColors {
        tile: UIColor(rgb:0xF3F8FD),
        navigation: UIColor(rgb:0xF4F6FA),
        background: UIColor(rgb:0xFFFFFF),
+        ems: UIColor(rgb: 0x7E69FF),
        namesAndAvatars: [
            UIColor(rgb:0x368BD6),
            UIColor(rgb:0xAC3BA8),
--- a/DesignKit/Variants/Fonts/ElementFonts.swift
+++ b/DesignKit/Variants/Fonts/ElementFonts.swift
@@ -28,26 +28,7 @@ public class ElementFonts {
    /// (even if that font was created with the appropriate metrics).
    public struct SharedFont {
        public let uiFont: UIFont
-        /// The underlying font for the `font` property. This is stored
-        /// as an optional `Any` due to unavailability on iOS 12.
-        private let _font: Any?
-        
-        @available(iOS 13.0, *)
-        public var font: Font {
-            _font as! Font
-        }
-        
-        @available(iOS, deprecated: 13.0, message: "Use init(uiFont:font:) instead and remove this initialiser.")
-        init(uiFont: UIFont) {
-            self.uiFont = uiFont
-            self._font = nil
-        }
-        
-        @available(iOS 13.0, *)
-        init(uiFont: UIFont, font: Font) {
-            self.uiFont = uiFont
-            self._font = font
-        }
+        public let font: Font
    }
    
    // MARK: - Setup
@@ -69,213 +50,101 @@ extension ElementFonts: Fonts {
    
    public var largeTitle: SharedFont {
        let uiFont = self.font(forTextStyle: .largeTitle)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .largeTitle)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .largeTitle)
    }
    
    public var largeTitleB: SharedFont {
        let uiFont = self.largeTitle.uiFont.vc_bold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .largeTitle.bold())
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .largeTitle.bold())
    }
            
    public var title1: SharedFont {
        let uiFont = self.font(forTextStyle: .title1)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title)
    }
    
    public var title1B: SharedFont {
        let uiFont = self.title1.uiFont.vc_bold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title.bold())
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title.bold())
    }
    
    public var title2: SharedFont {
        let uiFont = self.font(forTextStyle: .title2)
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title2)
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title2)
    }
    
    public var title2B: SharedFont {
        let uiFont = self.title2.uiFont.vc_bold
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title2.bold())
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title2.bold())
    }
    
    public var title3: SharedFont {
        let uiFont = self.font(forTextStyle: .title3)
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title3)
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title3)
    }
    
    public var title3SB: SharedFont {
        let uiFont = self.title3.uiFont.vc_semiBold
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .title3.weight(.semibold))
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .title3.weight(.semibold))
    }
    
    public var headline: SharedFont {
        let uiFont = self.font(forTextStyle: .headline)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .headline)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .headline)
    }
    
    public var subheadline: SharedFont {
        let uiFont = self.font(forTextStyle: .subheadline)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .subheadline)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .subheadline)
    }
    
    public var body: SharedFont {
        let uiFont = self.font(forTextStyle: .body)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .body)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .body)
    }
    
    public var bodySB: SharedFont {
        let uiFont = self.body.uiFont.vc_semiBold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .body.weight(.semibold))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .body.weight(.semibold))
    }
    
    public var callout: SharedFont {
        let uiFont = self.font(forTextStyle: .callout)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .callout)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .callout)
    }
    
    public var calloutSB: SharedFont {
        let uiFont = self.callout.uiFont.vc_semiBold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .callout.weight(.semibold))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .callout.weight(.semibold))
    }
    
    public var footnote: SharedFont {
        let uiFont = self.font(forTextStyle: .footnote)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .footnote)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .footnote)
    }
    
    public var footnoteSB: SharedFont {
        let uiFont = self.footnote.uiFont.vc_semiBold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .footnote.weight(.semibold))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .footnote.weight(.semibold))
    }
    
    public var caption1: SharedFont {
        let uiFont = self.font(forTextStyle: .caption1)
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .caption)
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .caption)
    }
    
    public var caption1SB: SharedFont {
        let uiFont = self.caption1.uiFont.vc_semiBold
-        
-        if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: .caption.weight(.semibold))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .caption.weight(.semibold))
    }
    
    public var caption2: SharedFont {
        let uiFont = self.font(forTextStyle: .caption2)
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .caption2)
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .caption2)
    }
    
    public var caption2SB: SharedFont {
        let uiFont = self.caption2.uiFont.vc_semiBold
-        
-        if #available(iOS 14.0, *) {
-            return SharedFont(uiFont: uiFont, font: .caption2.weight(.semibold))
-        } else if #available(iOS 13.0, *) {
-            return SharedFont(uiFont: uiFont, font: Font(uiFont))
-        } else {
-            return SharedFont(uiFont: uiFont)
-        }
+        return SharedFont(uiFont: uiFont, font: .caption2.weight(.semibold))
    }
 }
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -8,6 +8,7 @@ To build Element iOS project you need:
 - [Ruby](https://www.ruby-lang.org/), a dynamic programming language used by several build tools.
 - [CocoaPods](https://cocoapods.org), library dependencies manager for Xcode projects.
 - [XcodeGen](https://github.com/yonaskolb/XcodeGen), an Xcode project generator.
+- [Mint](https://github.com/yonaskolb/Mint), a package manager that installs and runs executable Swift packages
 - [bundler](https://bundler.io/) (optional), is also a dependency manager used to manage build tools dependency (CocoaPods, Fastlane).

 ### Install Ruby
@@ -26,12 +27,12 @@ $ gem install cocoapods

 In the last case please ensure that you are using the same version as indicated at the end of the `Podfile.lock` file.

-### Install XcodeGen
+### Install XcodeGen and Mint

-You can directly install XcodeGen with [Homebrew](https://brew.sh) or RubyGems:
+You can install XcodeGen and Mint using the included [Homebrew](https://brew.sh) Brewfile:

 ```
-$ brew install xcodegen
+$ brew bundle
 ```

 ### Install bundler (optional)
--- a/24
+++ b/24
@@ -1,7 +1,10 @@
 source 'https://github.com/CocoaPods/Specs.git'

 # Uncomment this line to define a global platform for your project
-platform :ios, '12.1'
+platform :ios, '14.0'
+
+# By default, ignore all warnings from any pod
+inhibit_all_warnings!

 # Use frameworks to allow usage of pods written in Swift
 use_frameworks!
@@ -13,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.3'
+$matrixSDKVersion = '= 0.23.8'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -45,8 +48,8 @@ $matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/ios

 # Method to import the MatrixSDK
 def import_MatrixSDK
-  pod 'MatrixSDK', $matrixSDKVersionSpec
-  pod 'MatrixSDK/JingleCallStack', $matrixSDKVersionSpec
+  pod 'MatrixSDK', $matrixSDKVersionSpec, :inhibit_warnings => false
+  pod 'MatrixSDK/JingleCallStack', $matrixSDKVersionSpec, :inhibit_warnings => false
 end

 ########################################
@@ -60,6 +63,7 @@ end

 def import_SwiftUI_pods
    pod 'Introspect', '~> 0.1'
+    pod 'DSBottomSheet', '~> 0.3'
 end

 abstract_target 'RiotPods' do
@@ -74,17 +78,11 @@ abstract_target 'RiotPods' do

  # PostHog for analytics
  pod 'PostHog', '~> 1.4.4'
-  pod 'AnalyticsEvents', :git => 'https://github.com/matrix-org/matrix-analytics-events.git', :branch => 'main'
+  pod 'AnalyticsEvents', :git => 'https://github.com/matrix-org/matrix-analytics-events.git', :branch => 'release/swift', :inhibit_warnings => false
  # pod 'AnalyticsEvents', :path => '../matrix-analytics-events/AnalyticsEvents.podspec'

-  # PostHog for analytics
-  pod 'PostHog', '~> 1.4.4'
-  pod 'AnalyticsEvents', :git => 'https://github.com/matrix-org/matrix-analytics-events.git', :branch => 'main'
-  # pod 'AnalyticsEvents', :path => '../matrix-analytics-events/AnalyticsEvents.podspec'
-
-  # Remove warnings from "bad" pods
-  pod 'OLMKit', :inhibit_warnings => true
-  pod 'zxcvbn-ios', :inhibit_warnings => true
+  pod 'OLMKit'
+  pod 'zxcvbn-ios'

  # Tools
  pod 'SwiftGen', '~> 6.3'
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -20,6 +20,7 @@ PODS:
  - BlueRSA (1.0.200)
  - DGCollectionViewLeftAlignFlowLayout (1.0.4)
  - Down (0.11.0)
+  - DSBottomSheet (0.3.0)
  - DSWaveformImage (6.1.1)
  - DTCoreText (1.6.26):
    - DTCoreText/Core (= 1.6.26)
@@ -38,7 +39,6 @@ PODS:
    - DTFoundation/Core
  - DTFoundation/UIKit (1.7.18):
    - DTFoundation/Core
-  - DTTJailbreakDetection (0.4.0)
  - ffmpeg-kit-ios-audio (4.5.1)
  - FLEX (4.5.0)
  - FlowCommoniOS (1.12.2)
@@ -57,19 +57,16 @@ PODS:
  - LoggerAPI (1.9.200):
    - Logging (~> 1.1)
  - Logging (1.4.0)
-  - MatomoTracker (7.4.1):
-    - MatomoTracker/Core (= 7.4.1)
-  - MatomoTracker/Core (7.4.1)
-  - MatrixSDK (0.23.3):
-    - MatrixSDK/Core (= 0.23.3)
-  - MatrixSDK/Core (0.23.3):
+  - MatrixSDK (0.23.8):
+    - MatrixSDK/Core (= 0.23.8)
+  - MatrixSDK/Core (0.23.8):
    - AFNetworking (~> 4.0.0)
    - GZIP (~> 1.3.0)
    - libbase58 (~> 0.1.4)
    - OLMKit (~> 3.2.5)
-    - Realm (= 10.16.0)
+    - Realm (= 10.27.0)
    - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.23.3):
+  - MatrixSDK/JingleCallStack (0.23.8):
    - JitsiMeetSDK (= 5.0.2)
    - MatrixSDK/Core
  - OLMKit (3.2.5):
@@ -79,9 +76,9 @@ PODS:
  - OLMKit/olmcpp (3.2.5)
  - PostHog (1.4.4)
  - ReadMoreTextView (3.0.1)
-  - Realm (10.16.0):
-    - Realm/Headers (= 10.16.0)
-  - Realm/Headers (10.16.0)
+  - Realm (10.27.0):
+    - Realm/Headers (= 10.27.0)
+  - Realm/Headers (10.27.0)
  - Reusable (4.1.2):
    - Reusable/Storyboard (= 4.1.2)
    - Reusable/View (= 4.1.2)
@@ -106,12 +103,12 @@ PODS:
  - ZXingObjC/All (3.6.5)

 DEPENDENCIES:
-  - AnalyticsEvents (from `https://github.com/matrix-org/matrix-analytics-events.git`, branch `main`)
+  - AnalyticsEvents (from `https://github.com/matrix-org/matrix-analytics-events.git`, branch `release/swift`)
  - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
  - Down (~> 0.11.0)
+  - DSBottomSheet (~> 0.3)
  - DSWaveformImage (~> 6.1.1)
  - DTCoreText (~> 1.6.25)
-  - DTTJailbreakDetection (~> 0.4.0)
  - ffmpeg-kit-ios-audio (= 4.5.1)
  - FLEX (~> 4.5.0)
  - FlowCommoniOS (~> 1.12.0)
@@ -120,9 +117,8 @@ DEPENDENCIES:
  - KeychainAccess (~> 4.2.2)
  - KTCenterFlowLayout (~> 1.3.1)
  - libPhoneNumber-iOS (~> 0.9.13)
-  - MatomoTracker (~> 7.4.1)
-  - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk`, tag `v0.23.3_bwi`)
-  - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk`, tag `v0.23.3_bwi`)
+  - MatrixSDK (= 0.23.8)
+  - MatrixSDK/JingleCallStack (= 0.23.8)
  - OLMKit
  - PostHog (~> 1.4.4)
  - ReadMoreTextView (~> 3.0.1)
@@ -138,17 +134,17 @@ DEPENDENCIES:
  - ZXingObjC (~> 3.6.5)

 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  trunk:
    - AFNetworking
    - BlueCryptor
    - BlueECC
    - BlueRSA
    - DGCollectionViewLeftAlignFlowLayout
    - Down
+    - DSBottomSheet
    - DSWaveformImage
    - DTCoreText
    - DTFoundation
-    - DTTJailbreakDetection
    - ffmpeg-kit-ios-audio
    - FLEX
    - FlowCommoniOS
@@ -163,7 +159,7 @@ SPEC REPOS:
    - libPhoneNumber-iOS
    - LoggerAPI
    - Logging
-    - MatomoTracker
+    - MatrixSDK
    - OLMKit
    - PostHog
    - ReadMoreTextView
@@ -182,19 +178,13 @@ SPEC REPOS:

 EXTERNAL SOURCES:
  AnalyticsEvents:
-    :branch: main
+    :branch: release/swift
    :git: https://github.com/matrix-org/matrix-analytics-events.git
-  MatrixSDK:
-    :git: https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk
-    :tag: v0.23.3_bwi

 CHECKOUT OPTIONS:
  AnalyticsEvents:
-    :commit: a0687ca6fbdb7258543d49b99fb88b9201e900b0
+    :commit: b275ccb194a219a61b3100159d51cadbf7c9020c
    :git: https://github.com/matrix-org/matrix-analytics-events.git
-  MatrixSDK:
-    :git: https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk
-    :tag: v0.23.3_bwi

 SPEC CHECKSUMS:
  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@@ -204,10 +194,10 @@ SPEC CHECKSUMS:
  BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
  DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
  Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
+  DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
  DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
  DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
  DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
-  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
  ffmpeg-kit-ios-audio: 662ce2064e56733ca7d8216705efbc38d9e1c3fe
  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
  FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
@@ -222,12 +212,11 @@ SPEC CHECKSUMS:
  libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
  LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
  Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixSDK: 4a2d2ddc1bd58c63f40e14706306e1beaffea02d
+  MatrixSDK: 6261d356de664b6245bb8697634038ca58f72a04
  OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
  PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
  ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
-  Realm: b6027801398f3743fc222f096faa85281b506e6c
+  Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
  Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
  SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
  SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
@@ -240,6 +229,6 @@ SPEC CHECKSUMS:
  zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: 82644f3408b6874a1dcd71e332ed7b8d18cac2f5
+PODFILE CHECKSUM: e860e1985e566efae3e629401c255070dd5278a7

-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_email_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_email_icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_email_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_email_icon.imageset/authentication_email_icon.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_email_icon.imageset/authentication_email_icon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 70 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M35,70C54.33,70 70,54.33 70,35C70,15.67 54.33,0 35,0C15.67,0 0,15.67 0,35C0,54.33 15.67,70 35,70ZM15.261,23.576L33.905,42.161C34.545,42.8 35.581,42.8 36.221,42.161L54.773,23.667C54.92,24.084 55,24.533 55,25L55,46C55,48.209 53.209,50 51,50L19,50C16.791,50 15,48.209 15,46L15,25C15,24.498 15.092,24.018 15.261,23.576ZM17.582,21.259C18.023,21.092 18.501,21 19,21L51,21C51.533,21 52.042,21.104 52.508,21.294L35.063,38.684L17.582,21.259Z" style="fill:rgb(13,189,139);"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_msisdn_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_msisdn_icon.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_msisdn_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_msisdn_icon.imageset/authentication_msisdn_icon.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_msisdn_icon.imageset/authentication_msisdn_icon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 70 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M35,70C54.33,70 70,54.33 70,35C70,15.67 54.33,0 35,0C15.67,0 0,15.67 0,35C0,54.33 15.67,70 35,70ZM28.378,41.602C30.28,43.655 34.858,47.21 36.106,47.94C36.18,47.983 36.264,48.033 36.359,48.09C38.263,49.221 44.229,52.768 48.576,49.449C51.944,46.877 50.849,43.985 49.715,43.125C48.939,42.521 46.652,40.857 44.501,39.359C42.389,37.887 41.211,39.066 40.415,39.863L38.77,41.508C38.362,41.916 37.742,41.767 37.148,41.301C35.015,39.677 33.447,38.11 32.662,37.325L32.656,37.318C31.871,36.534 30.323,34.984 28.699,32.852C28.233,32.258 28.084,31.638 28.491,31.23L30.137,29.584C30.934,28.789 32.113,27.611 30.641,25.499C29.143,23.348 27.479,21.061 26.875,20.285C26.015,19.151 23.122,18.056 20.551,21.424C17.232,25.771 20.779,31.737 21.91,33.641C21.967,33.736 22.017,33.82 22.06,33.894C22.79,35.142 26.325,39.7 28.378,41.602Z" style="fill:rgb(13,189,139);"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_server_selection_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_server_selection_icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_server_selection_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_server_selection_icon.imageset/authentication_server_selection_icon.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_server_selection_icon.imageset/authentication_server_selection_icon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 70 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M35,0C54.317,0 70,15.683 70,35C70,54.317 54.317,70 35,70C15.683,70 0,54.317 0,35C0,15.683 15.683,0 35,0ZM47.25,36.75L22.75,36.75C20.825,36.75 19.25,38.325 19.25,40.25L19.25,47.25C19.25,49.175 20.825,50.75 22.75,50.75L47.25,50.75C49.175,50.75 50.75,49.175 50.75,47.25L50.75,40.25C50.75,38.325 49.175,36.75 47.25,36.75ZM26.25,47.25C24.325,47.25 22.75,45.675 22.75,43.75C22.75,41.825 24.325,40.25 26.25,40.25C28.175,40.25 29.75,41.825 29.75,43.75C29.75,45.675 28.175,47.25 26.25,47.25ZM47.25,19.25L22.75,19.25C20.825,19.25 19.25,20.825 19.25,22.75L19.25,29.75C19.25,31.675 20.825,33.25 22.75,33.25L47.25,33.25C49.175,33.25 50.75,31.675 50.75,29.75L50.75,22.75C50.75,20.825 49.175,19.25 47.25,19.25ZM26.25,29.75C24.325,29.75 22.75,28.175 22.75,26.25C22.75,24.325 24.325,22.75 26.25,22.75C28.175,22.75 29.75,24.325 29.75,26.25C29.75,28.175 28.175,29.75 26.25,29.75Z" style="fill:rgb(13,189,139);"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_apple.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_apple.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_apple.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_apple.imageset/authentication_sso_apple.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_apple.imageset/authentication_sso_apple.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9721 2.2793C16.0601 3.42765 15.6969 4.56506 14.9598 5.44997C14.2446 6.33947 13.161 6.85183 12.0197 6.84008C11.9471 5.72478 12.3208 4.62638 13.0585 3.78679C13.8056 2.93583 14.8459 2.39758 15.9721 2.2793ZM19.5816 9.02677C18.2687 9.83389 17.4609 11.2573 17.441 12.7983C17.4429 14.5417 18.487 16.1151 20.0927 16.7942C19.7839 17.7974 19.3184 18.7454 18.7134 19.6033C17.901 20.8185 17.0492 22.0058 15.6973 22.0277C15.0543 22.0426 14.6203 21.8577 14.168 21.665C13.6963 21.4641 13.2047 21.2547 12.4354 21.2547C11.6196 21.2547 11.106 21.4708 10.6107 21.6793C10.1826 21.8594 9.76816 22.0338 9.1841 22.0581C7.89658 22.1057 6.91259 20.761 6.07065 19.5571C4.38785 17.0986 3.07748 12.6286 4.83421 9.5871C5.65915 8.10472 7.20157 7.16405 8.89715 7.10927C9.62738 7.09424 10.3281 7.3757 10.9424 7.62246C11.4122 7.81117 11.8315 7.97959 12.1749 7.97959C12.4767 7.97959 12.8843 7.81782 13.3593 7.62929C14.1076 7.33231 15.0232 6.96892 15.9562 7.06686C17.406 7.11222 18.7496 7.83856 19.5816 9.02677Z" fill="#17191C"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_facebook.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_facebook.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_facebook.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_facebook.imageset/authentication_sso_facebook.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_facebook.imageset/authentication_sso_facebook.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2258_29320" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="1" width="22" height="22">
+<path d="M1.50146 1.5H22.5002V22.3716H1.50146V1.5Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2258_29320)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.4999 11.999C22.4999 6.20003 17.7989 1.49902 11.9999 1.49902C6.20093 1.49902 1.49992 6.20003 1.49992 11.999C1.49992 17.2399 5.33962 21.5838 10.3593 22.3715V15.0342H7.69328V11.999H10.3593V9.68574C10.3593 7.05418 11.9269 5.60059 14.3253 5.60059C15.4741 5.60059 16.6757 5.80566 16.6757 5.80566V8.38965H15.3517C14.0473 8.38965 13.6405 9.19903 13.6405 10.0294V11.999H16.5527L16.0871 15.0342H13.6405V22.3715C18.6602 21.5838 22.4999 17.2399 22.4999 11.999Z" fill="#1877F2"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0871 15.0342L16.5527 11.999H13.6405V10.0294C13.6405 9.19903 14.0473 8.38965 15.3517 8.38965H16.6757V5.80566C16.6757 5.80566 15.4741 5.60059 14.3253 5.60059C11.9269 5.60059 10.3593 7.05418 10.3593 9.68574V11.999H7.69328V15.0342H10.3593V22.3715C10.8939 22.4553 11.4418 22.499 11.9999 22.499C12.5581 22.499 13.106 22.4553 13.6405 22.3715V15.0342H16.0871Z" fill="white"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_github.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_github.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_github.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_github.imageset/authentication_sso_github.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_github.imageset/authentication_sso_github.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.4421 7.10595C19.5702 5.6121 18.3876 4.42941 16.8939 3.55763C15.3999 2.6858 13.769 2.25 11.9999 2.25C10.231 2.25 8.59957 2.68594 7.10595 3.55763C5.6121 4.42937 4.4295 5.6121 3.55763 7.10595C2.68589 8.59975 2.25 10.231 2.25 11.9996C2.25 14.1242 2.86984 16.0346 4.10984 17.7315C5.34971 19.4284 6.95143 20.6027 8.91488 21.2543C9.14343 21.2967 9.31262 21.2669 9.42262 21.1656C9.53268 21.0641 9.58763 20.937 9.58763 20.7848C9.58763 20.7594 9.58546 20.531 9.58123 20.0993C9.57687 19.6676 9.57483 19.291 9.57483 18.9696L9.28283 19.0202C9.09665 19.0543 8.86179 19.0687 8.57823 19.0646C8.29481 19.0607 8.00059 19.031 7.69595 18.9757C7.39119 18.921 7.10773 18.794 6.84534 18.5952C6.58308 18.3963 6.39691 18.1359 6.28686 17.8145L6.15991 17.5224C6.07529 17.3279 5.94207 17.1118 5.76008 16.875C5.57808 16.638 5.39404 16.4773 5.20786 16.3927L5.11898 16.329C5.05975 16.2867 5.00479 16.2357 4.95397 16.1766C4.90319 16.1174 4.86517 16.0582 4.83978 15.9988C4.81435 15.9395 4.83542 15.8908 4.90323 15.8526C4.97104 15.8144 5.09359 15.7959 5.2714 15.7959L5.52521 15.8338C5.69449 15.8677 5.90388 15.969 6.15364 16.1384C6.40326 16.3076 6.60847 16.5277 6.7693 16.7984C6.96406 17.1455 7.1987 17.4099 7.4739 17.5919C7.74887 17.7739 8.02611 17.8648 8.30535 17.8648C8.58459 17.8648 8.82577 17.8436 9.02897 17.8015C9.23196 17.7592 9.4224 17.6955 9.60022 17.611C9.67639 17.0437 9.88377 16.6079 10.2222 16.3032C9.73984 16.2526 9.30617 16.1762 8.92097 16.0747C8.53599 15.973 8.13816 15.8081 7.72775 15.5794C7.31711 15.3509 6.97646 15.0673 6.70572 14.7289C6.43492 14.3904 6.21269 13.9459 6.03932 13.3959C5.86586 12.8457 5.77911 12.211 5.77911 11.4916C5.77911 10.4674 6.11349 9.59577 6.78211 8.87633C6.4689 8.10628 6.49846 7.24303 6.8709 6.28668C7.11635 6.21042 7.48034 6.26765 7.9627 6.458C8.44515 6.64845 8.79838 6.81159 9.02275 6.94685C9.24712 7.08207 9.42689 7.19666 9.56233 7.28959C10.3496 7.06962 11.162 6.95961 11.9998 6.95961C12.8376 6.95961 13.6502 7.06962 14.4375 7.28959L14.9199 6.98505C15.2498 6.78184 15.6394 6.59562 16.0877 6.42634C16.5362 6.25715 16.8792 6.21055 17.1163 6.28681C17.497 7.24321 17.531 8.10641 17.2177 8.87646C17.8862 9.5959 18.2208 10.4677 18.2208 11.4918C18.2208 12.2111 18.1337 12.8478 17.9605 13.4023C17.7871 13.9568 17.5629 14.4008 17.288 14.7353C17.0127 15.0697 16.6699 15.3511 16.2594 15.5795C15.8489 15.808 15.451 15.973 15.066 16.0746C14.6808 16.1763 14.2472 16.2527 13.7648 16.3035C14.2048 16.6842 14.4248 17.2851 14.4248 18.106V20.7845C14.4248 20.9366 14.4777 21.0637 14.5836 21.1652C14.6894 21.2665 14.8564 21.2964 15.085 21.2539C17.0487 20.6024 18.6504 19.4281 19.8902 17.7311C21.1299 16.0343 21.75 14.1238 21.75 11.9993C21.7496 10.2309 21.3134 8.59975 20.4421 7.10595Z" fill="black"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_gitlab.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_gitlab.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_gitlab.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_gitlab.imageset/authentication_sso_gitlab.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_gitlab.imageset/authentication_sso_gitlab.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.0004 20.3292L15.3166 10.1289H8.68915L12.0004 20.3292Z" fill="#E24329"/>
+<path d="M4.04348 10.1289L3.03364 13.2279C2.94226 13.5093 3.04095 13.8199 3.28214 13.9953L11.9996 20.3292L4.04348 10.1289Z" fill="#FCA326"/>
+<path d="M4.04248 10.1289H8.68727L6.68828 3.98572C6.58597 3.67143 6.1401 3.67143 6.03411 3.98572L4.04248 10.1289Z" fill="#E24329"/>
+<path d="M19.9602 10.1289L20.9664 13.2279C21.0577 13.5093 20.9591 13.8199 20.7179 13.9953L11.9991 20.3292L19.9602 10.1289Z" fill="#FCA326"/>
+<path d="M19.9616 10.1289H15.3168L17.3121 3.98572C17.4145 3.67143 17.8603 3.67143 17.9663 3.98572L19.9616 10.1289Z" fill="#E24329"/>
+<path d="M11.9991 20.3292L15.3153 10.1289H19.9601L11.9991 20.3292Z" fill="#FC6D26"/>
+<path d="M11.9985 20.3292L4.04248 10.1289H8.68727L11.9985 20.3292Z" fill="#FC6D26"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_google.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_google.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_google.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_google.imageset/authentication_sso_google.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_google.imageset/authentication_sso_google.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.5011 12.2336C22.5011 11.3702 22.4296 10.7402 22.2749 10.0869H12.2154V13.9835H18.1201C18.0011 14.9519 17.3582 16.4102 15.9296 17.3902L15.9096 17.5206L19.0903 19.9354L19.3106 19.9569C21.3344 18.1252 22.5011 15.4302 22.5011 12.2336Z" fill="#4285F4"/>
+<path d="M12.2147 22.4996C15.1075 22.4996 17.536 21.5662 19.3099 19.9562L15.9289 17.3895C15.0242 18.0078 13.8099 18.4395 12.2147 18.4395C9.38139 18.4395 6.97666 16.6079 6.11944 14.0762L5.99379 14.0866L2.68653 16.595L2.64328 16.7128C4.40516 20.1428 8.0242 22.4996 12.2147 22.4996Z" fill="#34A853"/>
+<path d="M6.12019 14.0765C5.894 13.4232 5.7631 12.7231 5.7631 11.9998C5.7631 11.2764 5.894 10.5765 6.10829 9.92313L6.1023 9.78398L2.75358 7.23535L2.64402 7.28642C1.91786 8.70978 1.50119 10.3081 1.50119 11.9998C1.50119 13.6915 1.91786 15.2897 2.64402 16.7131L6.12019 14.0765Z" fill="#FBBC05"/>
+<path d="M12.2148 5.55997C14.2266 5.55997 15.5837 6.41163 16.3576 7.12335L19.3814 4.23C17.5243 2.53834 15.1076 1.5 12.2148 1.5C8.02423 1.5 4.40517 3.85665 2.64328 7.28662L6.10756 9.92332C6.97668 7.39166 9.38143 5.55997 12.2148 5.55997Z" fill="#EB4335"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_twitter.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_twitter.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_sso_twitter.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_twitter.imageset/authentication_sso_twitter.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_sso_icon_twitter.imageset/authentication_sso_twitter.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.84156 21C6.41531 21 4.15363 20.2943 2.25 19.0767C3.86624 19.1813 6.71855 18.9308 8.49268 17.2386C5.82381 17.1161 4.6202 15.0692 4.4632 14.1945C4.68997 14.2819 5.77148 14.3869 6.382 14.142C3.31192 13.3722 2.84095 10.678 2.94561 9.85573C3.52125 10.2581 4.49809 10.3981 4.88185 10.3631C2.02109 8.31618 3.05027 5.23707 3.55613 4.57226C5.60912 7.4165 8.6859 9.01393 12.4923 9.10278C12.4205 8.78802 12.3826 8.46032 12.3826 8.12373C12.3826 5.70819 14.3351 3.75 16.7435 3.75C18.0019 3.75 19.1358 4.28457 19.9318 5.13963C20.7727 4.94258 22.0382 4.4813 22.6569 4.0824C22.3451 5.20208 21.3742 6.13612 20.7869 6.48231C20.7918 6.49408 20.7821 6.47048 20.7869 6.48231C21.3028 6.40428 22.6986 6.13603 23.25 5.76192C22.9773 6.39094 21.948 7.4368 21.1033 8.02232C21.2605 14.9535 15.9574 21 8.84156 21Z" fill="#1D9BF0"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_terms_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_terms_icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication_terms_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
--- a/Riot/Assets/Images.xcassets/Authentication/authentication_terms_icon.imageset/authentication_terms_icon.svg
+++ b/Riot/Assets/Images.xcassets/Authentication/authentication_terms_icon.imageset/authentication_terms_icon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 70 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M35,70C54.33,70 70,54.33 70,35C70,15.67 54.33,0 35,0C15.67,0 0,15.67 0,35C0,54.33 15.67,70 35,70ZM18.778,21.722C18.778,18.501 21.39,15.889 24.611,15.889L44.056,15.889C47.277,15.889 49.889,18.501 49.889,21.722L49.889,48.945C49.889,52.166 47.277,54.778 44.056,54.778L24.611,54.778C21.39,54.778 18.778,52.166 18.778,48.945L18.778,21.722ZM26.07,45.056C25.264,45.056 24.611,45.709 24.611,46.514C24.611,47.319 25.264,47.972 26.07,47.972L34.82,47.972C35.625,47.972 36.278,47.319 36.278,46.514C36.278,45.709 35.625,45.056 34.82,45.056L26.07,45.056ZM24.611,39.708C24.611,38.903 25.264,38.25 26.07,38.25L42.597,38.25C43.403,38.25 44.056,38.903 44.056,39.708C44.056,40.514 43.403,41.167 42.597,41.167L26.07,41.167C25.264,41.167 24.611,40.514 24.611,39.708Z" style="fill:rgb(13,189,139);"/>
+</svg>
--- a/Riot/Assets/Images.xcassets/Common/share_action_button.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Common/share_action_button.imageset/Contents.json
@@ -19,5 +19,8 @@
  "info" : {
    "author" : "xcode",
    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
  }
 }
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "location_background_dark_image.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_background_dark_image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_background_dark_image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_dark_image.imageset/location_background_dark_image@3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "location_background_light_image.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_background_light_image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_background_light_image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_background_light_image.imageset/location_background_light_image@3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "location_live_cell_ended_dark_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_live_cell_ended_dark_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_live_cell_ended_dark_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_dark_icon.imageset/location_live_cell_ended_dark_icon@3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "location_live_cell_ended_light_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_live_cell_ended_light_icon2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_live_cell_ended_light_icon3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_ended_light_icon.imageset/location_live_cell_ended_light_icon3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "Subtract.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Subtract@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Subtract@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_icon.imageset/Subtract@3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "location_live_cell_loading_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_live_cell_loading_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_live_cell_loading_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_live_cell_loading_icon.imageset/location_live_cell_loading_icon@3x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker@2x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker@2x.png
--- a/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker@3x.png
+++ b/Riot/Assets/Images.xcassets/Room/Location/location_user_marker.imageset/location_user_marker@3x.png
--- a/Riot/Assets/ar.lproj/Localizable.strings
+++ b/Riot/Assets/ar.lproj/Localizable.strings
@@ -96,7 +96,6 @@
 /** Image Messages **/

 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "لَقَد أرسَلَ %@ صُّورة %@";

 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "العُضو %@: * %@ %@";
--- a/Riot/Assets/bg.lproj/Localizable.strings
+++ b/Riot/Assets/bg.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ изпрати снимка %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ публикува снимка %@ в %@";
 /* A single unread message in a room */
--- a/Riot/Assets/bg.lproj/Vector.strings
+++ b/Riot/Assets/bg.lproj/Vector.strings
@@ -445,7 +445,6 @@
 "network_offline_prompt" = "Интернет връзката изглежда не работи.";
 "public_room_section_title" = "Публични стаи (в %@):";
 "bug_report_prompt" = "Приложението спря да работи последния път. Искате ли да изпратите съобщение за грешка?";
-"rage_shake_prompt" = "Изглежда, че разклащате телефона, което ни кара да мислим, че не сте доволни от %@. Искате ли да изпратите съобщение за грешка?";
 "do_not_ask_again" = "Не питай отново";
 "camera_access_not_granted" = "%@ няма разрешение да използва камерата. Моля, проверете настройките за сигурност";
 "large_badge_value_k_format" = "%.1fK";
@@ -469,7 +468,6 @@
 "bug_report_send" = "Изпрати";
 "no_voip" = "%@ Ви се обажда, но %@ все още не поддържа разговори.\nМожете да пренебрегнете това известие и да отговорите на това позвъняване от друго устройство или да го откажете.";
 // Crash report
-"google_analytics_use_prompt" = "Искате ли да помогнете за подобрението на %@ като анонимно изпращате съобщения за грешки и данни за използване?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ поддържа шифроване от край до край, но за да го включите трябва да влезете в профила си отново.\n\nМоже да го направите сега или по-късно от настройките на приложението.";
 "e2e_need_log_in_again" = "Трябва да влезете обратно в профила си, за да се създадат ключове за шифроване от-край-до-край за тази сесия и да се изпрати публичния ключ към Home сървъра.\nТова е еднократно. Извинете за неудобството.";
@@ -560,7 +558,6 @@
 "settings_key_backup_info_not_valid" = "Тази сесия не прави резервно копие на ключовете Ви, но имате съществуващо резервно копие, от което да възстановявате или допълвате в бъдеще.";
 "settings_key_backup_info_progress" = "Правене на резервно копие на %@ ключа…";
 "settings_key_backup_info_progress_done" = "Има резервно копие на всички ключове";
-"settings_key_backup_info_not_trusted_from_verifiable_device_fix_action" = "За да използвате Възстановяване на Защитени Съобщения на това устройство, потвърдете %@ сега.";
 "settings_key_backup_info_not_trusted_fix_action" = "За да използвате Възстановяване на Защитени Съобщения на това устройство, въведете паролата си или ключа за възстановяване.";
 "settings_key_backup_info_trust_signature_unknown" = "Резервното копие има подпис от сесия с идентификатор: %@";
 "settings_key_backup_info_trust_signature_valid" = "Резервното копие има валиден подпис от текущата сесия";
@@ -671,10 +668,6 @@
 "room_event_action_reply" = "Отговори";
 "room_event_action_edit" = "Редактирай";
 "auth_login_single_sign_on" = "Вход";
-"room_event_action_reaction_agree" = "Съгласи се с %@";
-"room_event_action_reaction_disagree" = "Противоречи на %@";
-"room_event_action_reaction_like" = "Харесай %@";
-"room_event_action_reaction_dislike" = "Не харесай %@";
 "room_action_reply" = "Отговори";
 "settings_labs_message_reaction" = "Реагирай на съобщения с емоджи";
 "settings_key_backup_button_connect" = "Свържи сесията към резервно копие на ключове";
@@ -820,7 +813,6 @@
 "room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Не е конфигуриран сървър за самоличност, така че не можете да започнете чат с контакт посредством имейл адрес.";
 // Service terms
 "service_terms_modal_title" = "Условия за ползване";
-"service_terms_modal_message" = "За да продължите, трябва да приемете Условията за ползване на тази услуга (%@).";
 "service_terms_modal_accept_button" = "Приеми";
 "service_terms_modal_description_for_identity_server" = "Бъдете откриваеми от потребители";
 "service_terms_modal_description_for_integration_manager" = "Използвайте ботове, връзки към други мрежи и стикери";
@@ -879,7 +871,6 @@
 "settings_identity_server_no_is_description" = "В момента не използвате сървър за самоличност. Добавете такъв по-горе, за да откривате и бъдете откриваеми от съществуващи ваши контакти.";
 // Identity server settings
 "identity_server_settings_title" = "Сървър за самоличност";
-"identity_server_settings_description" = "В момента използвате %2 за да откривате и да бъдете открити от съществуващи ваши контакти.";
 "identity_server_settings_no_is_description" = "В момента не използвате сървър за самоличност. Добавете такъв по-горе, за да откривате и бъдете открити от съществуващи ваши контакти.";
 "identity_server_settings_place_holder" = "Въведете сървър за самоличност";
 "identity_server_settings_add" = "Добави";
@@ -906,7 +897,6 @@
 "service_terms_modal_description_for_identity_server_2" = "Бъдете откриваеми по телефон или имейл";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Откриване на контакти";
-"service_terms_modal_message_identity_server" = "Приемете условията на сървъра за самоличност (%@) за да откривате контакти.";
 // Generic errors
 "error_invite_3pid_with_no_identity_server" = "Добавете сървър за самоличност в настройки за да каните по имейл.";
 "error_not_supported_on_mobile" = "Не може да правите това от %@ мобилен телефон.";
@@ -1348,7 +1338,6 @@
 "event_formatter_call_you_missed" = "Пропуснахте това обаждане";
 "event_formatter_call_you_declined" = "Отказахте разговора";
 "event_formatter_call_you_currently_in" = "Активен разговор";
-"event_formatter_call_has_ended" = "Прекратяване на %@";
 "event_formatter_call_ringing" = "Звънене…";
 "event_formatter_call_connecting" = "Свързване…";
 "event_formatter_call_video" = "Видео разговор";
@@ -1481,7 +1470,6 @@
 "notice_room_aliases" = "Адресите на стаята са: %@";
 "notice_room_related_groups" = "Групите, асоциирани с тази стая, са: %@";
 "notice_encrypted_message" = "Шифровано съобщение";
-"notice_encryption_enabled" = "%@ включи шифроването от край до край (алгоритъм %@)";
 "notice_image_attachment" = "прикачена снимка";
 "notice_audio_attachment" = "прикачено аудио";
 "notice_video_attachment" = "прикачено видео";
@@ -1503,7 +1491,6 @@
 // room display name
 "room_displayname_empty_room" = "Празна стая";
 "room_displayname_two_members" = "%@ и %@";
-"room_displayname_more_than_two_members" = "%@ и %u други";
 // Settings
 "settings" = "Настройки";
 "settings_enable_inapp_notifications" = "Включване на известия в приложението";
--- a/Riot/Assets/ca.lproj/InfoPlist.strings
+++ b/Riot/Assets/ca.lproj/InfoPlist.strings
@@ -1,5 +1,8 @@
 // Permissions usage explanations
 "NSCameraUsageDescription" = "La càmera s'utilitza per fer fotos i vídeos, fer vídeo conferència.";
 "NSPhotoLibraryUsageDescription" = "La fototeca s'utilitza per enviar fotos i vídeos.";
-"NSMicrophoneUsageDescription" = "El micròfon s'utilitza per fer vídeos, fer trucades.";
-"NSContactsUsageDescription" = "Per tal de mostrar-vos quins dels vostres contactes ja són usuaris de Element o Matrix, podem enviar les seves adreces i números de telèfon desades a la vostra agenda cap al vostre servidor d'identitats de Matrix. El nou Vector no emmagatzema aquestes dades ni les usa per a cap altra finalitat. Per a més informació, si us plau visiteu l'apartat de política de privacitat als paràmetres de l'aplicació.";
+"NSMicrophoneUsageDescription" = "Element necessita accedir al vostre micròfon per a fer i rebre trucades, vídeos i gravar missatges de veu.";
+"NSContactsUsageDescription" = "Element us mostrarà els vostres contactes per si els voleu convidar a xatejar.";
+"NSLocationWhenInUseUsageDescription" = "Quan compartiu la vostra localització amb altres, Element en necessita accés per mostrar-lis un mapa.";
+"NSFaceIDUsageDescription" = "Face ID es fa servir per accedir a la vostra app.";
+"NSCalendarsUsageDescription" = "Consulteu la vostra agenda de reunions a l'app.";
--- a/Riot/Assets/ca.lproj/Localizable.strings
+++ b/Riot/Assets/ca.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ ha enviat una foto %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ ha publicat una foto %@ a %@";
 /* Multiple unread messages in a room */
--- a/Riot/Assets/ca.lproj/Vector.strings
+++ b/Riot/Assets/ca.lproj/Vector.strings
@@ -260,7 +260,6 @@
 "settings_report_bug" = "Informa d'un error";
 "settings_config_home_server" = "El servidor hoste és %@";
 "settings_config_identity_server" = "El servidor d'identitat és %@";
-"settings_config_user_id" = "Sessió iniciada com";
 "settings_user_settings" = "Ajustos d'usuari";
 "settings_notifications_settings" = "Ajustos de notificacions";
 "settings_calls_settings" = "Trucades";
@@ -463,7 +462,6 @@
 "no_voip_title" = "Trucada entrant";
 "no_voip" = "%@ t'està trucant però %@ encara no suporta trucades.\nPots ignorar aquesta notificació i respondre la trucada des de un altre dispositiu o pots rebutjar-la.";
 // Crash report
-"google_analytics_use_prompt" = "T'agradaria ajudar a millorar %@ enviant automàticament informes de bloquejos i ús de dades?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ ara permet l'ús de xifrat punt a punt però has de tornar a connectar-te per tal d'activar-lo.\n\nPots fer-ho ara o més tard des de les preferències de l'aplicació.";
 "e2e_need_log_in_again" = "Has de tornar a iniciar sessió per tal de generar claus de xifrat punt a punt per a aquest dispositiu i enviar la clau pública al servidor.\nAixò només s'ha de fer un cop, disculpa les molèsties.";
@@ -647,7 +645,6 @@
 "notice_room_aliases" = "Els àlies de la sala són: %@";
 "notice_room_related_groups" = "Els grups associats amb aquesta sala són: %@";
 "notice_encrypted_message" = "Missatge xifrat";
-"notice_encryption_enabled" = "%@ ha activat el xifrat punt a punt (algoritme %@)";
 "notice_image_attachment" = "adjunt d'imatge";
 "notice_audio_attachment" = "adjunt d'àudio";
 "notice_video_attachment" = "adjunt de vídeo";
@@ -669,7 +666,6 @@
 // room display name
 "room_displayname_empty_room" = "Sala buida";
 "room_displayname_two_members" = "%@ i %@";
-"room_displayname_more_than_two_members" = "%@ i %u més";
 // Settings
 "settings" = "Configuració";
 "settings_enable_inapp_notifications" = "Habilitar les notificacions de les App integrades";
--- a/Riot/Assets/cs.lproj/Vector.strings
+++ b/Riot/Assets/cs.lproj/Vector.strings
@@ -139,7 +139,6 @@
 "contacts_address_book_section" = "LOKÁLNÍ KONTAKTY";
 "contacts_address_book_matrix_users_toggle" = "Pouze Matrix uživatelé";
 "contacts_address_book_no_contact" = "Žádné lokální kontakty";
-"contacts_address_book_permission_denied" = "Nepovolil jste přístup aplikace Element k místním kontaktům";
 "contacts_user_directory_section" = "UŽIVATELSKÝ ADRESÁŘ";
 "contacts_user_directory_offline_section" = "UŽIVATELSKÝ ADRESÁŘ (offline)";
 // Chat participants
@@ -269,7 +268,6 @@
 "room_participants_action_ban" = "Vyhodit z této místnosti";
 "room_creation_error_invite_user_by_email_without_identity_server" = "Není nakonfigurován žádný server identity, takže nemůžete přidat účastníka pomocí e-mailu.";
 "auth_softlogout_recover_encryption_keys" = "Přihlaste se a obnovte šifrovací klíče uložené výhradně v tomto zařízení. Potřebujete je ke čtení všech zabezpečených zpráv na jakémkoli zařízení.";
-"auth_softlogout_reason" = "Váš správce domovského serveru (%1$@) vás odhlásil z vašeho účtu %2 @ (%3$@).";
 "auth_softlogout_signed_out" = "Jste odhlášeni";
 "auth_autodiscover_invalid_response" = "Neplatná odpověď na objevení domovského serveru";
 "auth_accept_policies" = "Přečtěte si a přijměte zásady tohoto domovského serveru:";
@@ -378,3 +376,33 @@
 "done" = "Hotovo";
 "open" = "Otevřít";
 "enable" = "Povolit";
+"onboarding_avatar_accessibility_label" = "Profilová fotka";
+"onboarding_avatar_message" = "Toto můžeš změnit kdykoliv.";
+"onboarding_avatar_title" = "Přidat profilovou fotku";
+"onboarding_display_name_max_length" = "Tvoje jméno musí být kratší než 256 charakterů";
+"onboarding_display_name_hint" = "Tohle můžeš změnit později";
+"onboarding_display_name_placeholder" = "Svoje jméno";
+"onboarding_display_name_message" = "Tohle se ukáže, když pošleš zprávy.";
+"onboarding_display_name_title" = "Vyber si svoje jméno";
+"onboarding_personalization_skip" = "Přeskočit tento krok";
+"onboarding_personalization_save" = "Uložit a pokračovat";
+"onboarding_congratulations_home_button" = "Vezmi mě domů";
+"onboarding_congratulations_personalize_button" = "Personalizovat profil";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Váš účet %@ byl vytvořen.";
+"onboarding_congratulations_title" = "Gratulace!";
+"saving" = "Ukládání";
+
+// Activities
+"loading" = "Načítání";
+"confirm" = "Potvrdit";
+"edit" = "Upravit";
+"suggest" = "Doporučit";
+"error" = "Chyba";
+"add" = "Přidat";
+"existing" = "Existující";
+"new_word" = "Nový";
+"stop" = "Zastavit";
+"public" = "Veřejný";
+"private" = "Soukromý";
+"joining" = "Připojování";
--- a/Riot/Assets/cy.lproj/Localizable.strings
+++ b/Riot/Assets/cy.lproj/Localizable.strings
@@ -13,7 +13,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "Anfonwyd %@ lun %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "Postiodd %@ lun %@ yn %@";
 /* A single unread message in a room */
--- a/Riot/Assets/cy.lproj/Vector.strings
+++ b/Riot/Assets/cy.lproj/Vector.strings
@@ -623,7 +623,6 @@
 "no_voip_title" = "Galwad sy'n dod i mewn";
 "no_voip" = "Mae %@ yn eich ffonio ond nid yw %@ yn cefnogi galwadau eto.\nGallwch anwybyddu'r hysbysiad hwn ac ateb yr alwad o ddyfais arall neu gallwch ei wrthod.";
 // Crash report
-"google_analytics_use_prompt" = "Hoffech chi helpu i wella %@ trwy gyrru adroddiadau pall a data defnydd dienw yn awtomatig?";
 // Crypto
 "e2e_enabling_on_app_update" = "Mae %@ bellach yn cefnogi amgryptio o'r dechrau i'r diwedd ond mae angen i chi fewngofnodi eto i'w alluogi.\n\nGallwch ei wneud nawr neu'n hwyrach o'r gosodiadau.";
 "e2e_need_log_in_again" = "Mae angen i chi fewngofnodi i gynhyrchu allweddi amgryptio o'r dechrau i'r diwedd ar gyfer y sesiwn hon a chyflwyno'r allwedd gyhoeddus i'ch hafanweinydd\nDim ond unwaith fydd rhaid gwneud hyn; sori am yr anghyfleustra.";
@@ -678,7 +677,6 @@
 "gdpr_consent_not_given_alert_review_now_action" = "Adolygu rwan";
 // Service terms
 "service_terms_modal_title" = "Telerau Gwasanaeth";
-"service_terms_modal_message" = "I barhau maen' rhaid i chi dderbyn telerau y gwasanaeth hwn (%@).";
 "service_terms_modal_accept_button" = "Derbyn";
 "service_terms_modal_decline_button" = "Gwrthod";
 "service_terms_modal_description_for_identity_server_1" = "Dod o hyd i eraill dros y ffôn neu e-bost";
@@ -686,7 +684,6 @@
 "service_terms_modal_description_for_integration_manager" = "Defnyddiwch Botiau, pontydd, teclynnau a phecynnau sticeri";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Darganfod Cysylltiadau";
-"service_terms_modal_message_identity_server" = "Derbyn telerau'r gweinydd adnabod (%@) i ddarganfod cysylltiadau.";
 "deactivate_account_title" = "Dad-actifadu Cyfrif";
 "deactivate_account_informations_part1" = "Bydd hyn yn golygu na ellir defnyddio'ch cyfrif yn barhaol. Ni fyddwch yn gallu mewngofnodi, ac ni fydd unrhyw un yn gallu ailgofrestru'r un dynodwr defnyddiwr. Bydd hyn yn achosi i'ch cyfrif adael yr holl ystafelloedd y mae'n cymryd rhan ynddynt, a bydd yn tynnu manylion eich cyfrif o'ch gweinydd adnabod. ";
 "deactivate_account_informations_part2_emphasize" = "Ni ellir gwrthdroi'r weithred hon.";
@@ -1098,7 +1095,6 @@
 "notice_room_aliases" = "Arallenwau'r ystafell yw: %@";
 "notice_room_related_groups" = "Y grwpiau sy'n gysylltiedig â'r ystafell hon yw: %@";
 "notice_encrypted_message" = "Neges amgryptiedig";
-"notice_encryption_enabled" = "Trodd %@ ar amgryptio o'r dechrau i'r diwedd (algorithm %@)";
 "notice_image_attachment" = "atodiad llun";
 "notice_audio_attachment" = "atodiad sain";
 "notice_video_attachment" = "atodiad fideo";
--- a/Riot/Assets/de.lproj/Localizable.strings
+++ b/Riot/Assets/de.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ hat ein Bild gesendet %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ sendet ein Bild %@ in %@";
 /* Multiple unread messages in a room */
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -275,7 +275,7 @@
 "settings_add_email_address" = "E-Mail-Adresse hinzufügen";
 "settings_remove_phone_prompt_msg" = "Bist du sicher, dass du die Telefon-Nummer %@ entfernen möchtest?";
 "settings_night_mode" = "Nachtmodus";
-"settings_enable_push_notif" = "Benachrichtungen auf diesem Gerät";
+"settings_enable_push_notif" = "Benachrichtigungen auf diesem Gerät";
 "settings_unignore_user" = "Alle Nachrichten von %@ anzeigen?";
 "settings_contacts_phonebook_country" = "Land des Telefonbuches";
 "settings_labs_e2e_encryption" = "Ende-zu-Ende-Verschlüsselung";
@@ -444,10 +444,9 @@
 "call_incoming_voice_prompt" = "Eingehender Sprachanruf von %@";
 "call_incoming_video_prompt" = "Eingehender Videoanruf von %@";
 // No VoIP support
-"no_voip_title" = "Eingehener Anruf";
+"no_voip_title" = "Eingehender Anruf";
 "no_voip" = "%@ ruft dich an, aber %@ unterstützt derzeit keine Anrufe.\nDu kannst diese Benachrichtung ignorieren und den Anruf von einem anderen Gerät annehmen oder ihn abweisen.";
 // Crash report
-"google_analytics_use_prompt" = "Möchtest du helfen %@ zu verbessern, indem du anonyme Absturzberichte und Daten über die Verwendung sendest?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ unterstützt nun Ende-zu-Ende Verschlüsselung. Um sie zu aktivieren musst du dich erneut anmelden.\n\nDu kannst sie nun aktivieren oder später in den Einstellungen.";
 "e2e_need_log_in_again" = "Du musst dich erneut anmelden um Ende-zu-Ende Schlüssel für diese Sitzung zu erstellen und zum Server zu senden.\nDies ist nur einmal notwendig.";
@@ -622,7 +621,6 @@
 "settings_key_backup_info_none" = "Deine Schlüssel werden nicht von dieser Sitzung gesichert.";
 "settings_key_backup_info_signout_warning" = "Sichere deine Schlüssel damit du sie beim Abmelden nicht verlierst.";
 "settings_key_backup_info_version" = "Version der Schlüsselsicherung: %@";
-"settings_key_backup_info_algorithm" = "Algorithmus";
 "settings_key_backup_info_valid" = "Diese Sitzung sichert deine Schlüssel.";
 "settings_key_backup_info_not_valid" = "Diese Sitzung sichert nicht dein Schlüssel, es ist jedoch eine Sicherungskopie vorhanden, von der du deine Schlüssel wiederherstellen und die du später hinzufügen kannst.";
 "settings_key_backup_info_progress" = "Sichere %@ Schlüssel…";
@@ -721,10 +719,6 @@
 "room_message_unable_open_link_error_message" = "Konnte Link nicht öffnen.";
 "room_event_action_reply" = "Antworten";
 "room_event_action_edit" = "Bearbeiten";
-"room_event_action_reaction_agree" = "%@ zustimmen";
-"room_event_action_reaction_disagree" = "%@ nicht zustimmen";
-"room_event_action_reaction_like" = "%@ zustimmen";
-"room_event_action_reaction_dislike" = "%@ nicht zustimmen";
 "room_action_reply" = "Antworten";
 "settings_labs_message_reaction" = "Mit einem Emoji reagieren";
 "settings_key_backup_button_connect" = "Verbinde diese Sitzung mit der Schlüsselsicherung";
@@ -802,7 +796,7 @@
 "auth_softlogout_recover_encryption_keys" = "Melde dich an, um ausschließlich auf diesem Gerät gespeicherte Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten auf jedem Gerät zu lesen.";
 "auth_softlogout_clear_data" = "Persönliche Daten löschen";
 "auth_softlogout_clear_data_message_1" = "Warnung: Deine persönlichen Daten (einschließlich Verschlüsselungsschlüssel) sind noch auf diesem Gerät gespeichert.";
-"auth_softlogout_clear_data_message_2" = "Deaktiviere es, wenn du dieses Gerät nicht mehr verwendest oder du dich mit einem anderen Konto anmelden möchtst.";
+"auth_softlogout_clear_data_message_2" = "Deaktiviere es, wenn du dieses Gerät nicht mehr verwendest oder du dich mit einem anderen Konto anmelden möchtest.";
 "auth_softlogout_clear_data_button" = "Lösche alle Daten";
 "auth_softlogout_clear_data_sign_out_title" = "Bist du sicher?";
 "auth_softlogout_clear_data_sign_out_msg" = "Möchtest du wirklich alle derzeit auf diesem Gerät gespeicherten Daten löschen? Melde dich erneut an, um auf deine Kontodaten und Nachrichten zuzugreifen.";
@@ -871,7 +865,6 @@
 "room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Es ist kein Identitätsserver konfiguriert, sodass du keinen Chat mit einem Kontakt über eine E-Mail starten kannst.";
 // Service terms
 "service_terms_modal_title" = "Nutzungsbedingungen";
-"service_terms_modal_message" = "Um fortzufahren, musst du die Nutzungsbedingungen akzeptieren (%@).";
 "service_terms_modal_accept_button" = "Akzeptieren";
 "service_terms_modal_description_for_identity_server" = "Für andere auffindbar sein";
 "service_terms_modal_description_for_integration_manager" = "Bots, Brücken, Widgets und Aufkleberpakete verwenden";
@@ -949,7 +942,6 @@
 "identity_server_settings_alert_error_invalid_identity_server" = "%@ ist kein gültiger Identitätsserver.";
 "call_no_stun_server_error_message_1" = "Bitte die Administration deines Heimservers %@, einen TURN-Server zu konfigurieren, damit Anrufe zuverlässig funktionieren.";
 "call_no_stun_server_error_message_2" = "Alternativ kannst du versuchen, den öffentlichen Server unter %@ zu verwenden. Dieser wird nicht so zuverlässig sein, und deine IP-Adresse wird mit ihm geteilt. Du kannst dies auch in den Einstellungen konfigurieren";
-"service_terms_modal_message_identity_server" = "Akzeptiere die Bedingungen des Identitätsservers (%@), um Kontakte zu finden.";
 "identity_server_settings_alert_disconnect_still_sharing_3pid" = "Du teilst noch deine persönlichen Daten mit dem Identitätsserver %@.\n\nWir empfehlen dir deine E-Mail-Adresse und Telefonnummer zu entfernen, bevor du die Verbindung zum Identitätsserver trennst.";
 "settings_add_3pid_password_title_email" = "E-Mail-Adresse hinzufügen";
 "settings_add_3pid_password_title_msidsn" = "Telefonnummer hinzufügen";
@@ -1434,7 +1426,6 @@
 "callbar_only_multiple_paused" = "%@ pausierte Anrufe";
 "callbar_only_single_paused" = "Pausierter Anruf";
 "callbar_active_and_multiple_paused" = "1 aktiver Anruf (%@) · %@ pausierte Anrufe";
-"callbar_active_and_single_paused" = "1 aktiver Anruf (%1$s) · 1 pausierter Anruf";

 // Call Bar
 "callbar_only_single_active" = "Zurück zum Anruf (%@)";
@@ -1855,10 +1846,9 @@
 "onboarding_use_case_work_messaging" = "Teams";
 "onboarding_use_case_community_messaging" = "Gemeinschaften";
 /* The placeholder string contains onboarding_use_case_skip_button as a tappable action */
-"onboarding_use_case_not_sure_yet" = "Noch nicht sicher? Du kannst";
 "onboarding_use_case_skip_button" = "diese Frage überspringen";
-"onboarding_use_case_existing_server_message" = "Willst du einen existierenden Server beitreten?";
-"onboarding_use_case_existing_server_button" = "MIt Server verbinden";
+"onboarding_use_case_existing_server_message" = "Willst du einem existierenden Server beitreten?";
+"onboarding_use_case_existing_server_button" = "Mit Server verbinden";
 "search_filter_placeholder" = "Filtern";


@@ -1994,7 +1984,6 @@
 // room display name
 "room_displayname_empty_room" = "Leerer Raum";
 "room_displayname_two_members" = "%@ und %@";
-"room_displayname_more_than_two_members" = "%@ und %u andere";
 // Settings
 "settings" = "Einstellungen";
 "settings_enable_inapp_notifications" = "Benachrichtigungen innerhalb der App aktivieren";
@@ -2068,8 +2057,8 @@
 "room_please_select" = "Bitte wähle einen Raum";
 "room_error_join_failed_title" = "Konnte Raum nicht betreten";
 "room_error_join_failed_empty_room" = "Es ist aktuell nicht möglich einen leeren Raum zu betreten.";
-"room_error_name_edition_not_authorized" = "Du bist nicht authorisiert den Raumnamen zu ändern";
-"room_error_topic_edition_not_authorized" = "Du bist nicht authorisiert das Raumthema zu ändern";
+"room_error_name_edition_not_authorized" = "Du bist nicht autorisiert den Raumnamen zu ändern";
+"room_error_topic_edition_not_authorized" = "Du bist nicht autorisiert das Raumthema zu ändern";
 "room_error_cannot_load_timeline" = "Konnte Verlauf nicht laden";
 "room_error_timeline_event_not_found_title" = "Konnte Position im Verlauf nicht laden";
 "room_error_timeline_event_not_found" = "Konnte spezifischen Punkt im Verlauf dieses Raumes nicht finden";
@@ -2085,7 +2074,7 @@
 "message_reply_to_message_to_reply_to_prefix" = "Als Antwort auf";
 // Room members
 "room_member_ignore_prompt" = "Sicher, dass alle Nachrichten von diesem Benutzer versteckt werden sollen?";
-"room_member_power_level_prompt" = "Du kannst diese Änderung nicht rückgangig machen, weil du dem Benutzer die gleiche Berechtigungsstufe gibst, die du selbst hast.\nBist du sicher?";
+"room_member_power_level_prompt" = "Du kannst diese Änderung nicht rückgängig machen, weil du dem Benutzer die gleiche Berechtigungsstufe gibst, die du selbst hast.\nBist du sicher?";
 // Attachment
 "attachment_size_prompt" = "Möchtest du senden als:";
 "attachment_original" = "Originalgröße (%@)";
@@ -2117,7 +2106,7 @@
 "e2e_passphrase_enter" = "Passphrase eingeben";
 // E2E export
 "e2e_export_room_keys" = "Exportiere Raumschlüssel";
-"e2e_export_prompt" = "Dieser Prozeß erlaubt den Export von Schlüsseln, die du in verschlüsselten Räumen empfangen hast, in eine lokale Datei. Du kannst dann die Datei in einem anderen Matrixclient in Zukunft importieren, so dass dieser Client die Nachrichten auch entschlüsseln kann.\nDie exportierte Datei wird jedem der sie lesen kann erlauben, alle verschlüsselten Nachrichten sehen können, also verwahre die Datei sicher.";
+"e2e_export_prompt" = "Dieser Prozess erlaubt den Export von Schlüsseln, die du in verschlüsselten Räumen empfangen hast, in eine lokale Datei. Du kannst dann die Datei in einem anderen Matrixclient in Zukunft importieren, so dass dieser Client die Nachrichten auch entschlüsseln kann.\nDie exportierte Datei wird jedem der sie lesen kann erlauben, alle verschlüsselten Nachrichten sehen können, also verwahre die Datei sicher.";
 "e2e_export" = "Exportiere";
 "e2e_passphrase_confirm" = "Passphrase bestätigen";
 "e2e_passphrase_empty" = "Die Passphrase darf nicht leer sein";
@@ -2299,7 +2288,7 @@
 "notification_settings_receive_a_call" = "Benachrichtige, wenn ich einen Anruf erhalte";
 "notification_settings_suppress_from_bots" = "Unterdrücke Benachrichtigungen von Bots";
 "notification_settings_by_default" = "Als Standard...";
-"notification_settings_notify_all_other" = "Benachrichtige für alle andereren Nachrichten/Räume";
+"notification_settings_notify_all_other" = "Benachrichtige für alle anderen Nachrichten/Räume";
 // gcm section
 // Settings keys

@@ -2327,7 +2316,7 @@
 "call_more_actions_change_audio_device" = "Audiogerät ändern";
 "call_more_actions_unhold" = "Fortsetzen";
 "call_more_actions_hold" = "Halten";
-"call_holded" = "Du hast den Anurf pausiert";
+"call_holded" = "Du hast den Anruf pausiert";
 "call_remote_holded" = "%@ hat den Anruf pausiert";
 "notice_declined_video_call_by_you" = "Du hast den Anruf abgelehnt";
 "notice_declined_video_call" = "%@ hat den Anruf abgelehnt";
@@ -2356,3 +2345,20 @@
 "settings_labs_use_only_latest_user_avatar_and_name" = "Immer aktuelle Profilbilder und Nicknamen anzeigen";
 "room_participants_leave_success" = "Raum verlassen";
 "room_participants_leave_processing" = "Verlassen";
+"onboarding_display_name_title" = "Wähle einen Anzeigenamen";
+"onboarding_personalization_save" = "Speichern und weiter";
+"callbar_active_and_single_paused" = "1 aktiver Anruf (%@) · 1 unterbrochener Anruf";
+"onboarding_congratulations_personalize_button" = "Profil personalisieren";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Dein Account %@ wurde erstellt.";
+"onboarding_congratulations_title" = "Herzlichen Glückwunsch!";
+"saving" = "Speichern";
+
+// Activities
+"loading" = "Laden";
+"confirm" = "Bestätigen";
+"edit" = "Bearbeiten";
+"suggest" = "Vorschlagen";
+"add" = "Hinzufügen";
+"new_word" = "Neu";
+"stop" = "Stop";
--- a/Riot/Assets/en.lproj/InfoPlist.strings
+++ b/Riot/Assets/en.lproj/InfoPlist.strings
@@ -22,3 +22,4 @@
 "NSCalendarsUsageDescription" = "See your scheduled meetings in the app.";
 "NSFaceIDUsageDescription" = "Face ID is used to access your app.";
 "NSLocationWhenInUseUsageDescription" = "When you share your location to people, Element needs access to show them a map.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "When you share your location to people, Element needs access to show them a map.";
--- a/Riot/Assets/en.lproj/Untranslated.strings
+++ b/Riot/Assets/en.lproj/Untranslated.strings
@@ -20,4 +20,57 @@

 "image_picker_action_files" = "Choose from files";

+// MARK: Onboarding Authentication WIP
+"authentication_registration_title" = "Create your account";
+"authentication_registration_message" = "We’ll need some info to get you set up.";
+"authentication_registration_username" = "Username";
+"authentication_registration_username_footer" = "You can’t change this later";
+"authentication_registration_password_footer" = "Must be 8 characters or more";
+
+"authentication_login_title" = "Welcome back!";
+"authentication_login_username" = "Username or Email";
+"authentication_login_forgot_password" = "Forgot password";
+
+"authentication_server_info_title" = "Choose your server to store your data";
+"authentication_server_info_matrix_description" = "Join millions for free on the largest public server";
+
+"authentication_server_selection_title" = "Choose your server";
+"authentication_server_selection_message" = "What is the address of your server? A server is like a home for all your data.";
+"authentication_server_selection_server_url" = "Server URL";
+"authentication_server_selection_server_footer" = "You can only connect to a server that has already been set up";
+"authentication_server_selection_generic_error" = "Cannot find a server at this URL, please check it is correct.";
+
+"authentication_cancel_flow_confirmation_message" = "Your account is not created yet. Stop the registration process?";
+
+"authentication_verify_email_input_title" = "Enter your email address";
+"authentication_verify_email_input_message" = "This will help verify your account and enables password recovery.";
+"authentication_verify_email_text_field_placeholder" = "Email Address";
+"authentication_verify_email_waiting_title" = "Check your email to verify.";
+"authentication_verify_email_waiting_message" = "To confirm your email address, tap the button in the email we just sent to %@";
+"authentication_verify_email_waiting_hint" = "Did not receive an email?";
+"authentication_verify_email_waiting_button" = "Resend email";
+
+"authentication_verify_msisdn_input_title" = "Enter your phone number";
+"authentication_verify_msisdn_input_message" = "This will help verify your account and enables password recovery.";
+"authentication_verify_msisdn_text_field_placeholder" = "Phone Number";
+"authentication_verify_msisdn_otp_text_field_placeholder" = "Verification Code";
+"authentication_verify_msisdn_waiting_title" = "Confirm your phone number";
+"authentication_verify_msisdn_waiting_message" = "We just sent a code to %@. Enter it  below to verify it’s you.";
+"authentication_verify_msisdn_waiting_button" = "Resend code";
+"authentication_verify_msisdn_invalid_phone_number" = "Invalid phone number";
+
+"authentication_terms_title" = "Privacy policy";
+"authentication_terms_message" = "Please read through T&C. You must accept in order to continue.";
+"authentication_terms_policy_url_error" = "Unable to find the selected policy. Please try again later.";
+
+"authentication_recaptcha_message" = "This server would like to make sure you are not a robot";
+
+// MARK: Spaces WIP
 "spaces_feature_not_available" = "This feature isn't available here. For now, you can do this with %@ on your computer.";
+
+"leave_space_action" = "Leave space";
+"leave_space_and_one_room" = "Leave space and 1 room";
+"leave_space_and_more_rooms" = "Leave space and %@ rooms";
+"leave_space_selection_title" = "SELECT ROOMS";
+"leave_space_selection_all_rooms" = "Select all rooms";
+"leave_space_selection_no_rooms" = "Select no rooms";
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -76,6 +76,7 @@
 "error" = "Error";
 "suggest" = "Suggest";
 "edit" = "Edit";
+"confirm" = "Confirm";

 // Activities
 "loading" = "Loading";
@@ -298,8 +299,10 @@ Tap the + to start adding people.";
 "directory_cell_title" = "Browse directory";
 "directory_cell_description" = "%tu rooms";
 "directory_search_results_title" = "Browse directory results";
-"directory_search_results" = "%tu results found for %@";
-"directory_search_results_more_than" = ">%tu results found for %@";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. */
+"directory_search_results" = "%1$tu results found for %2$@";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. Note the > at the start indicates "more than 20 results". */
+"directory_search_results_more_than" = ">%1$tu results found for %2$@";
 "directory_searching_title" = "Searching directory…";
 "directory_search_fail" = "Failed to fetch data";

@@ -645,6 +648,7 @@ Tap the + to start adding people.";
 "settings_calls_stun_server_fallback_description" = "Allow fallback call assist server %@ when your homeserver does not offer one (your IP address would be shared during a call).";

 "settings_integrations_allow_button" = "Manage integrations";
+/* The %@ placeholder will be replaced with the integration manager's URL. */
 "settings_integrations_allow_description" = "Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";

 "settings_ui_language" = "Language";
@@ -676,6 +680,7 @@ Tap the + to start adding people.";
 "settings_labs_enable_threads" = "Threaded messaging";
 "settings_labs_enable_auto_report_decryption_errors" = "Auto Report Decryption Errors";
 "settings_labs_use_only_latest_user_avatar_and_name" = "Show latest avatar and name for users in message history";
+"settings_labs_enable_live_location_sharing" = "Live location sharing - share current location (active development, and temporarily, locations persist in room history)";

 "settings_version" = "Version %@";
 "settings_olm_version" = "Olm Version %@";
@@ -2255,14 +2260,38 @@ Tap the + to start adding people.";

 "location_sharing_settings_toggle_title" = "Enable location sharing";

+"location_sharing_allow_background_location_title" = "Allow access";
+"location_sharing_allow_background_location_message" = "If you’d like to share your Live location, Element needs location access when the app is in the background.
+To enable access, tap Settings> Location and select Always";
+"location_sharing_allow_background_location_validate_action" = "Settings";
+"location_sharing_allow_background_location_cancel_action" = "Not now";
+
 // MARK: Live location sharing

 "location_sharing_live_share_title" = "Share live location";
 "live_location_sharing_banner_title" = "Live location enabled";
+"live_location_sharing_ended" = "Live location ended";
 "live_location_sharing_banner_stop" = "Stop";
 "location_sharing_static_share_title" = "Send my current location";
 "location_sharing_pin_drop_share_title" = "Send this location";
 "location_sharing_live_map_callout_title" = "Share location";
+"location_sharing_live_viewer_title" = "Location";
+"location_sharing_live_list_item_time_left" = "%@ left";
+"location_sharing_live_list_item_sharing_expired" = "Sharing expired";
+"location_sharing_live_list_item_last_update" = "Updated %@ ago";
+"location_sharing_live_list_item_last_update_invalid" = "Unknown last update";
+"location_sharing_live_list_item_current_user_display_name" = "You";
+"location_sharing_live_list_item_stop_sharing_action" = "Stop sharing";
+"location_sharing_live_timer_incoming" = "Live until %@";
+"location_sharing_live_loading" = "Loading Live location...";
+"location_sharing_live_error" = "Live location error";
+"location_sharing_live_timer_selector_title" = "Choose for how long others will see your accurate location.";
+"location_sharing_live_timer_selector_short" = "for 15 minutes";
+"location_sharing_live_timer_selector_medium" = "for 1 hour";
+"location_sharing_live_timer_selector_long" = "for 8 hours";
+"location_sharing_live_no_user_locations_error_title" = "No user locations available";
+"location_sharing_live_stop_sharing_error" = "Fail to stop sharing location";
+"location_sharing_live_stop_sharing_progress" = "Stop location sharing";

 // MARK: - MatrixKit

--- a/Riot/Assets/eo.lproj/Vector.strings
+++ b/Riot/Assets/eo.lproj/Vector.strings
@@ -312,8 +312,6 @@
 "joined" = "Aliĝita";
 "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Uzi rehavajn pasfrazon aŭ ŝlosilon";
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Uzi rehavan ŝlosilon";
-"device_verification_self_verify_wait_additional_information" = "Ĉi tio funkcias por Element kaj aliaj klientoj kapablaj je delegaj subskriboj.";
-"device_verification_self_verify_wait_information" = "Kontrolu ĉi tiun saluton per unu el viaj aliaj salutaĵoj, dononte al ĝi aliron al ĉifritaj mesaĝoj.\n\nUzu la plej freŝan version de Element per viaj aliaj aparatoj:";
 "device_verification_self_verify_wait_new_sign_in_title" = "Kontrolu ĉi tiun saluton";

 // MARK: Self verification wait
@@ -347,7 +345,6 @@
 "device_verification_incoming_description_2" = "Kontrolo de ĉi tiu salutaĵo markos ĝin fidata, kaj markos ankaŭ vian salutaĵon fidata por la kunulo.";
 "secure_key_backup_setup_intro_use_security_key_title" = "Uzi Sekurecan ŝlosilon";
 "secure_key_backup_setup_intro_info" = "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj per savkopiado de ŝlosiloj al via servilo.";
-"rerequest_keys_alert_message" = "Bonvolu ruli Elementon per alia aparato, kiu povas malĉifri la mesaĝon, por ke ĝi povu resendi la ŝlosilojn al ĉi tiu salutaĵo.";

 // Re-request confirmation dialog
 "rerequest_keys_alert_title" = "Peto sendiĝis";
@@ -367,7 +364,6 @@

 "deactivate_account_title" = "Malaktivigi konton";
 "service_terms_modal_policy_checkbox_accessibility_hint" = "Kontrolu por akcepti %@";
-"service_terms_modal_message_identity_server" = "Akceptu la uzokondiĉojn de la identiga servilo (%@) por trovi kontaktojn.";

 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Trovado de kontaktoj";
@@ -376,7 +372,6 @@
 "service_terms_modal_description_for_identity_server_1" = "Trovi aliajn per telefono aŭ retpoŝtadreso";
 "service_terms_modal_decline_button" = "Rifuzi";
 "service_terms_modal_accept_button" = "Akcepti";
-"service_terms_modal_message" = "Por daŭrigi, vi devas akcepti la uzokondiĉojn de ĉi tiu servo (%@).";

 // Service terms
 "service_terms_modal_title" = "Uzokondiĉoj";
@@ -452,10 +447,8 @@
 "e2e_need_log_in_again" = "Vi bezonas resaluti por estigi tutvoje ĉifrajn ŝlosilojn porĉi tiu salutaĵo, kaj sendi la publikan ŝlosilon al via hejmservilo.\nTio necesas nur unufoje; pardonu la ĝenon.";

 // Crypto
-"e2e_enabling_on_app_update" = "Element nun subtenas tutvojan ĉifradon, sed vi bezonas resaluti por ŝalti ĝin.\n\nVi povas fari tion nun, aŭ pli poste per agordoj de la aplikaĵo.";

 // Crash report
-"google_analytics_use_prompt" = "Ĉu vi volus nin helpi pri plibonigoj al %@ per memaga kaj sennoma raportado de fiaskoj kaj datumoj pri uzado?";
 "no_voip" = "%@ vin vokas, sed %@ ankoraŭ ne subtenas vokojn.\nVi povas malatenti ĉi tiun sciigon kaj respondi la vokon per alia aparato, aŭ vi povas ĝin rifuzi.";

 // No VoIP support
@@ -656,7 +649,6 @@

 // MARK: - Major update

-"major_update_title" = "Riot nun estas Element";
 "cross_signing_setup_banner_subtitle" = "Kontrolu aliajn viajn aparatojn pli facile";

 // MARK: - Cross-signing
@@ -975,7 +967,6 @@
 "settings_integrations_allow_button" = "Administri kunigojn";
 "settings_calls_stun_server_fallback_description" = "Permesi repaŝan servilon %@ asistan je vokoj, kiam la hejmservilo ne provizas servilon (via IP-adreso ne doniĝus dum voko).";
 "settings_calls_stun_server_fallback_button" = "Permesi repaŝan servilon asistan je vokoj";
-"settings_callkit_info" = "Ricevi vokpetojn ĉe via ŝlosa ekrano. Vidi viajn vokojn de Element ĉe la sistema vokhistorio. Se iCloud estas ŝaltita, la vokhistorio doniĝas ankaŭ al Apple.";
 "settings_pin_rooms_with_unread" = "Alpingli ĉambrojn kun nelegitaj mesaĝoj";
 "settings_pin_rooms_with_missed_notif" = "Alpinigli ĉambrojn kun nerimarkitaj sciigoj";
 "settings_show_decrypted_content" = "Montri malĉifritajn enhavojn";
@@ -1145,7 +1136,6 @@
 "identity_server_settings_alert_error_terms_not_accepted" = "Vi devas akcepti la uzokondiĉojn de %@, por uzi ĝin kiel identiga servilo.";
 "identity_server_settings_alert_disconnect" = "Ĉu malkonektu de la identiga servilo %@?";
 "identity_server_settings_alert_disconnect_title" = "Malkonektu identigan servilon";
-"identity_server_settings_alert_change" = "Ĉu malkonektu de identiga servilo %1$@ kaj anstataŭe konektu al %@$A?";
 "identity_server_settings_alert_change_title" = "Ŝanĝu identigan servilon";
 "identity_server_settings_alert_no_terms" = "Via elektita identiga servilo ne havas uzokondiĉojn. Daŭrigu nur se vi fidas la posedanton de tiu servilo.";
 "identity_server_settings_alert_no_terms_title" = "Identiga servilo ne havas uzokondiĉojn";
@@ -1171,7 +1161,6 @@
 // Manage session
 "manage_session_title" = "Administru salutaĵon";
 "security_settings_user_password_description" = "Konfirmi vian identon per enigo de via pasvorto";
-"security_settings_coming_soon" = "Bedaŭron. Ĉi tiu funkcio ne jam estas subtenata por Element iOS. Bonvolu uzi alian Matrix klienton por agordi ĝin. Element iOS sekvos ĝin.";
 "security_settings_complete_security_alert_message" = "Vi kompletigu sekurigon je ĉi tiu salutaĵo unue.";
 "security_settings_complete_security_alert_title" = "Kompletigi sekurigon";
 "security_settings_blacklist_unverified_devices_description" = "Kontroli ĉiujn salutaĵojn de uzanto, por marki ilin fidata kaj sendi mesaĝojn al ĝi.";
@@ -1268,7 +1257,6 @@
 "room_participants_filter_room_members_for_dm" = "Filtri ĉambranojn";
 "room_participants_add_participant" = "Aldoni partoprenanton";
 "contacts_user_directory_offline_section" = "KATALOGO DE UZANTOJ (nefunkcia)";
-"contacts_address_book_permission_denied" = "Vi ne permesis al Element aliri viajn lokajn kontaktojn";
 "rooms_empty_view_information" = "Ĉambroj taŭgas por ajna grupbabilo, privata aŭ publika. Premu la + por trovi ekzistantaj ĉambroj, aŭ fari novajn.";
 "rooms_empty_view_title" = "Ĉambroj";
 "people_empty_view_information" = "Sekure babili kun iu ajn.Premu la + por inviti personojn.";
@@ -1416,7 +1404,6 @@
 "event_formatter_call_back" = "Revoki";
 "event_formatter_call_you_declined" = "Vi rifuzis ĉi tiun vokon";
 "event_formatter_call_you_currently_in" = "Aktiva voko";
-"event_formatter_call_has_ended" = "Finiĝis %@";
 "event_formatter_call_video" = "Vidvoko";
 "event_formatter_call_voice" = "Voĉvoko";

--- a/Riot/Assets/es.lproj/Localizable.strings
+++ b/Riot/Assets/es.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ te envió una imagen %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ publicó una imagen %@ en %@";
 /* A single unread message in a room */
--- a/Riot/Assets/es.lproj/Vector.strings
+++ b/Riot/Assets/es.lproj/Vector.strings
@@ -66,7 +66,6 @@
 "deactivate_account_password_alert_message" = "Para continuar, introduce la contraseña de tu cuenta de Matrix";
 "deactivate_account_forget_messages_information_part2_emphasize" = "Advertencia";
 "deactivate_account_informations_part2_emphasize" = "Esta acción es irreversible.";
-"rerequest_keys_alert_message" = "Por favor, abre Element en otro dispositivo que pueda descifrar el mensaje para que envíe las claves a esta sesión.";
 // Re-request confirmation dialog
 "rerequest_keys_alert_title" = "Solicitud Enviada";
 "auth_password_dont_match" = "Las contraseñas no coinciden";
@@ -160,8 +159,8 @@
 "directory_cell_title" = "Explorar directorio";
 "directory_cell_description" = "%tu salas";
 "directory_search_results_title" = "Explorar resultados de directorio";
-"directory_search_results" = "%tu resultados encontrados para %@";
-"directory_search_results_more_than" = ">%tu resultados encontrados para %@";
+"directory_search_results" = "%1$tu resultados encontrados para %2$@";
+"directory_search_results_more_than" = ">%1$tu resultados encontrados para %2$@";
 "directory_search_fail" = "Error al buscar datos";
 "contacts_address_book_no_contact" = "No hay contactos locales";
 "contacts_address_book_permission_required" = "Se requiere permiso para acceder a tus contactos locales";
@@ -495,9 +494,7 @@
 "no_voip_title" = "Llamada entrante";
 "no_voip" = "%@ te está llamando pero %@ aún no admite llamadas.\nPuedes ignorar esta notificación y contestar la llamada desde otro dispositivo o puedes rechazarla.";
 // Crash report
-"google_analytics_use_prompt" = "¿Te gustaría ayudar a mejorar %@ enviando automáticamente informes de fallas y datos de uso anónimos?";
 // Crypto
-"e2e_enabling_on_app_update" = "Element ahora admite cifrado de extremo a extremo, pero debes volver a iniciar sesión para activarlo.\n\nPuedes hacerlo ahora o más tarde desde los ajustes de la aplicación.";
 "e2e_need_log_in_again" = "Tienes que volver a iniciar sesión para generar claves de cifrado de extremo a extremo para este dispositivo y enviar la clave pública a tu servidor base.\nSolo hay que hacer esto una vez, disculpa las molestias.";
 // Bug report
 "bug_report_title" = "Informe de Error";
@@ -740,7 +737,6 @@
 "notice_room_aliases" = "Los aliases de la sala son: %@";
 "notice_room_related_groups" = "Los grupos asociados a esta sala son: %@";
 "notice_encrypted_message" = "Mensaje cifrado";
-"notice_encryption_enabled" = "%@ activó el cifrado de extremo a extremo (algoritmo %@)";
 "notice_image_attachment" = "imagen adjunta";
 "notice_audio_attachment" = "audio adjunto";
 "notice_video_attachment" = "vídeo adjunto";
@@ -764,7 +760,6 @@
 // room display name
 "room_displayname_empty_room" = "Sala vacía";
 "room_displayname_two_members" = "%@ y %@";
-"room_displayname_more_than_two_members" = "%@ y otros %u";
 // Settings
 "settings" = "Ajustes";
 "settings_enable_inapp_notifications" = "Habilitar notificaciones de la aplicación";
@@ -1876,7 +1871,7 @@
 // MARK: - Favourites

 "favourites_empty_view_title" = "Salas y personas favoritas";
-"home_syncing" = "Sincronización";
+"home_syncing" = "Sincronizando";
 "home_context_menu_leave" = "Salir";
 "home_context_menu_normal_priority" = "Prioridad normal";
 "home_context_menu_low_priority" = "Prioridad baja";
@@ -1911,19 +1906,19 @@

 "room_info_list_one_member" = "1 miembro";
 "create_room_placeholder_address" = "#saladepruebas:matrix.org";
-"create_room_section_header_address" = "Dirección de la sala";
+"create_room_section_header_address" = "DIRECCIÓN";
 "create_room_show_in_directory" = "Incluir en la lista pública de salas";
 "create_room_section_footer_type" = "La gente solo puede unirse a una sala privada si les invitas.";
-"create_room_type_public" = "Sala pública";
-"create_room_type_private" = "Sala privada";
-"create_room_section_header_type" = "Tipo de sala";
+"create_room_type_public" = "Sala pública (cualquiera)";
+"create_room_type_private" = "Sala privada (por invitación)";
+"create_room_section_header_type" = "QUIÉN PUEDE ACCEDER";
 "create_room_section_footer_encryption" = "Una vez la actives, no podrás desactivarla.";
 "create_room_enable_encryption" = "Activar cifrado";
-"create_room_section_header_encryption" = "Cifrado de la sala";
-"create_room_placeholder_topic" = "Asunto";
-"create_room_section_header_topic" = "Asunto de la sala (opcional)";
+"create_room_section_header_encryption" = "CIFRADO";
+"create_room_placeholder_topic" = "¿De qué va esta sala?";
+"create_room_section_header_topic" = "ASUNTO (OPCIONAL)";
 "create_room_placeholder_name" = "Nombre";
-"create_room_section_header_name" = "Nombre de la sala";
+"create_room_section_header_name" = "NOMBRE";

 // MARK: - Create Room

@@ -2227,3 +2222,199 @@
 "rooms_empty_view_information" = "Las salas son buena opción para grupos públicos o privados. Toca el + para encontrar salas existentes o crear nuevas.";
 "contacts_address_book_no_identity_server" = "No hay un servidor de identidad configurado";
 "find_your_contacts_identity_service_error" = "No se ha podido conectar con el servidor de identidad.";
+"stop" = "Parar";
+"room_displayname_more_than_two_members" = "%@ y %@ más";
+"ignore_user" = "Ignorar usuario";
+"location_sharing_live_list_item_stop_sharing_action" = "Dejar de compartir";
+"location_sharing_live_list_item_current_user_display_name" = "Tú";
+"location_sharing_live_list_item_last_update_invalid" = "Última actualización desconocida";
+"location_sharing_live_list_item_last_update" = "Actualizado hace %@";
+"location_sharing_live_list_item_sharing_expired" = "Caducado";
+"location_sharing_live_list_item_time_left" = "queda %@";
+"location_sharing_live_viewer_title" = "Ubicación";
+"location_sharing_live_map_callout_title" = "Compartir ubicación";
+"location_sharing_pin_drop_share_title" = "Enviar esta ubicación";
+"location_sharing_static_share_title" = "Enviar mi ubicación actual";
+"live_location_sharing_banner_stop" = "Detener";
+"live_location_sharing_banner_title" = "Compartiendo ubicación en tiempo real";
+
+// MARK: Live location sharing
+
+"location_sharing_live_share_title" = "Compartir ubicación en tiempo real";
+"side_menu_coach_message" = "Desliza hacia la derecha o toca para ver todas las salas";
+"spaces_add_room_missing_permission_message" = "No tienes permiso para añadir salas a este espacio.";
+"spaces_creation_in_one_space" = "en 1 espacio";
+"spaces_creation_in_many_spaces" = "en %@ espacios";
+"spaces_creation_in_spacename_plus_many" = "en %@ + %@ espacios";
+"spaces_creation_in_spacename_plus_one" = "en %@ + 1 espacio";
+"spaces_creation_in_spacename" = "en %@";
+"spaces_creation_post_process_inviting_users" = "Invitando a %@ personas";
+"spaces_creation_post_process_adding_rooms" = "Añadiendo %@ salas";
+"spaces_creation_post_process_creating_room" = "Creando %@";
+"spaces_creation_post_process_uploading_avatar" = "Enviando avatar";
+"spaces_creation_post_process_creating_space_task" = "Creando %@";
+"spaces_creation_post_process_creating_space" = "Creando espacio";
+"spaces_creation_invite_by_username_message" = "También puedes invitarles en otro momento.";
+"spaces_creation_invite_by_username_title" = "Invita a tu equipo";
+"spaces_creation_invite_by_username" = "Invitar por nombre de usuario";
+"spaces_creation_add_rooms_message" = "Como este espacio es solo para ti, nadie más se enterará. Puedes añadir más en otro momenro.";
+"spaces_creation_add_rooms_title" = "¿Qué quieres añadir?";
+"spaces_creation_sharing_type_me_and_teammates_detail" = "Un espacio privado para tu equipo y tú";
+"spaces_creation_sharing_type_me_and_teammates_title" = "Mi equipo y yo";
+"spaces_creation_sharing_type_just_me_detail" = "Un espacio privado para organizar tus salas";
+"spaces_creation_sharing_type_just_me_title" = "Solo yo";
+"spaces_creation_sharing_type_message" = "Asegúrate de que la gente apropiada puede acceder a %@. Puedes cambiarlo más adelante.";
+"spaces_creation_sharing_type_title" = "¿Con quién vas a trabajar?";
+"spaces_creation_email_invites_email_title" = "Email";
+"spaces_creation_email_invites_message" = "También puedes invitarles más tarde.";
+"spaces_creation_email_invites_title" = "Invita a tu equipo";
+"spaces_creation_new_rooms_support" = "Ayuda";
+"spaces_creation_new_rooms_random" = "Otros";
+"spaces_creation_new_rooms_general" = "General";
+"spaces_creation_new_rooms_room_name_title" = "Nombre de la sala";
+"spaces_creation_new_rooms_message" = "Crearemos una sala para cada tema.";
+"spaces_creation_new_rooms_title" = "¿De qué se hablará?";
+"spaces_creation_cancel_message" = "Perderás el progreso.";
+"spaces_creation_cancel_title" = "¿Parar de crear un espacio?";
+"spaces_creation_private_space_title" = "Tu espacio privado";
+"spaces_creation_public_space_title" = "Tu espacio público";
+"spaces_creation_address_already_exists" = "%@\nya existe";
+"spaces_creation_address_invalid_characters" = "%@\ntiene caracteres no válidos";
+"spaces_creation_address_default_message" = "Tu espacio se podrá ver desde\n%@";
+"spaces_creation_empty_room_name_error" = "El nombre es necesario";
+"spaces_creation_address" = "Dirección";
+"spaces_creation_settings_message" = "Añade algún detalle para ayudar a que destaque. Lo puedes cambiar en cualquier momento.";
+"spaces_creation_footer" = "Puedes cambiarlo más adelante";
+"spaces_creation_visibility_message" = "Para unirte a un espacio que ya exista, pide que te inviten a él.";
+"spaces_creation_visibility_title" = "¿Qué tipo de espacio quieres crear?";
+
+// Mark: - Space Creation
+
+"spaces_creation_hint" = "Los espacios son una nueva manera de agrupar salas y personas.";
+"space_settings_current_address_message" = "Tu espacio es accesible desde\n%@";
+"space_settings_update_failed_message" = "Fallo al actualizar los ajustes del espacio. ¿Quieres reintentarlo?";
+"space_settings_access_section" = "¿Quién puede acceder a este espacio?";
+"space_topic" = "Descripción";
+"space_public_join_rule_detail" = "Público, recomendado para comunidades";
+"spaces_add_space" = "Añadir espacio";
+"spaces_add_room" = "Añadir sala";
+"spaces_invite_people" = "Invitar genre";
+"space_private_join_rule_detail" = "Solo por invitación (recomendado si es para ti o para equipos)";
+"spaces_explore_rooms_one_room" = "1 sala";
+"spaces_explore_rooms_room_number" = "%@ salas";
+"spaces_create_space_title" = "Crear un espacio";
+"spaces_add_space_title" = "Crear espacio";
+"room_invite_not_enough_permission" = "No tienes permiso para invitar a esta sala";
+"space_invite_not_enough_permission" = "No tienes permiso para invitar a este espacio";
+"room_invite_to_room_option_detail" = "No serán parte de %@.";
+"room_invite_to_room_option_title" = "Solo para esta sala";
+"room_invite_to_space_option_detail" = "Pueden explorar %@, pero no serán miembros de %@.";
+
+// Mark: - Room invite
+
+"room_invite_to_space_option_title" = "Para %@";
+"share_invite_link_space_text" = "Oye, únete a este espacio en %@";
+"share_invite_link_room_text" = "Oye, únete a esta sala en %@";
+
+// MARK: - Share invite link
+
+"share_invite_link_action" = "Compartir enlace de invitación";
+"create_room_processing" = "Creando sala";
+"create_room_suggest_room" = "Sugerir a los miembros del espacio";
+"create_room_show_in_directory_footer" = "Esto ayudará a que la gente la encuentre y se una.";
+"create_room_promotion_header" = "PROMOCIÓN";
+"create_room_section_footer_type_private" = "Solo las personas invitadas pueden encontrarla y unirse.";
+"create_room_type_restricted" = "Miembros del espacio";
+"rerequest_keys_alert_message" = "Por favor, abre %@ en otro dispositivo para recibir las claves en esta sesión y poder descifrar los mensajes.";
+
+// Crypto
+"e2e_enabling_on_app_update" = "Ahora, %@ ofrece cifrado de extremo a extremo. Para usarlo, tienes que volver a iniciar sesión y activarlo.\n\nPuedes hacerlo ahora, o más adelante desde los ajustes de la aplicación.";
+"call_jitsi_unable_to_start" = "No ha sido posible empezar la llamada en grupo";
+"room_suggestion_settings_screen_message" = "Los miembros del espacio verán la sala como sugerida para unirse.";
+"room_suggestion_settings_screen_title" = "Sugiere una sala dentro de un espacio";
+
+// Room suggestion Settings
+"room_suggestion_settings_screen_nav_title" = "Sugerir sala";
+"room_access_space_chooser_other_spaces_section" = "Otros espacios o salas";
+"room_access_space_chooser_known_spaces_section" = "Espacios que conoces e incluyen %@";
+"room_access_settings_screen_setting_room_access" = "Configurando acceso";
+"room_access_settings_screen_upgrade_alert_upgrading" = "Actualizando la sala";
+"room_access_settings_screen_upgrade_alert_upgrade_button" = "Actualizar";
+"room_access_settings_screen_upgrade_alert_auto_invite_switch" = "Invitar miembros automáticamente a la nueva sala";
+"room_access_settings_screen_upgrade_alert_note" = "Al actualizar, se crea una nueva versión de la sala. Todos los mensajes actuales se quedarán archivados aquí.";
+"room_access_settings_screen_upgrade_alert_message" = "Cualquiera en %@ podrá encontrar la sala y unirse a ella, sin que tengas que invitarle manualmente. Puedes cambiar esto cuando quieras en los ajustes de la sala.";
+"room_access_settings_screen_upgrade_alert_title" = "Actualizar sala";
+"room_access_settings_screen_public_message" = "Cualquiera puede encontrarla y unirse.";
+"room_access_settings_screen_edit_spaces" = "Editar espacios";
+"room_access_settings_screen_upgrade_required" = "Actualización necesaria";
+"room_access_settings_screen_restricted_message" = "Permitir que cualquiera en un ciertos espacios la encuentre y se una.\nTendrás que elegir qué espacios.";
+"room_access_settings_screen_private_message" = "Solo las personas invitadas pueden encontrar y unirse.";
+"room_access_settings_screen_message" = "Decide quién puede encontrar y unirse a %@.";
+"room_access_settings_screen_title" = "¿Quién puede acceder a esta sala?";
+
+// Room Access Settings
+"room_access_settings_screen_nav_title" = "Acceso a la sala";
+"room_details_promote_room_suggest_title" = "Sugerir a los miembros del espacio";
+"room_details_access_row_title" = "Acceso";
+"settings_presence_offline_mode_description" = "Si lo activas, los demás siempre te verán como desconectado, incluso mientras usas la aplicación.";
+"settings_presence_offline_mode" = "Modo desconectado";
+"settings_presence" = "Presencia";
+"settings_labs_enable_auto_report_decryption_errors" = "Informar automáticamente de errores al descifrar";
+"room_preview_decline_invitation_options" = "¿Quieres rechazar la invitación o ignorar a quien te ha invitado?";
+"threads_discourage_information_2" = "\n\n¿Activar los hilos de todas formas?";
+"threads_discourage_information_1" = "Tu servidor base todavía no es compatible con los hilos, por lo que pueden funcionar de forma inesperada. Algunos hilos estarán disponibles de forma estable. ";
+"threads_beta_cancel" = "Ahora no";
+"threads_beta_enable" = "Probar";
+"threads_beta_information_link" = "Más información";
+"threads_beta_information" = "Mantén las conversaciones organizadas con hilos.\n\nLos hilos te ayudan a mantener centradas las conversaciones y a seguirlas fácilmente. ";
+"threads_notice_title" = "Los hilos ya no son un experimento 🎉";
+"threads_beta_title" = "Hilos";
+"threads_notice_done" = "Vale";
+"onboarding_celebration_button" = "Continuar";
+"onboarding_celebration_message" = "Hemos guardado tus preferencias.";
+"onboarding_celebration_title" = "¡Ya estás!";
+"onboarding_avatar_accessibility_label" = "Imagen de perfil";
+"onboarding_display_name_max_length" = "Tu nombre público debe tener menos de 256 caracteres";
+"onboarding_display_name_hint" = "Puedes cambiarlo más adelante";
+"onboarding_display_name_placeholder" = "Nombre público";
+"onboarding_display_name_message" = "Esto aparecerá junto a tus mensajes.";
+"onboarding_display_name_title" = "Elige tu nombre público";
+"onboarding_personalization_skip" = "Saltar este paso";
+"onboarding_personalization_save" = "Guardar y continuar";
+"onboarding_congratulations_home_button" = "Ir al inicio";
+"onboarding_congratulations_personalize_button" = "Personalizar perfil";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Has creado tu cuenta, %@.";
+"onboarding_congratulations_title" = "¡Enhorabuena!";
+"saving" = "Guardando";
+
+// Activities
+"loading" = "Cargando";
+"edit" = "Editar";
+"add" = "Añadir";
+"new_word" = "Nuevo";
+"location_sharing_live_timer_incoming" = "Compartiendo hasta %@";
+"onboarding_avatar_message" = "Puedes cambiarlo más adelante.";
+"onboarding_avatar_title" = "Añadir una foto de perfil";
+"confirm" = "Confirmar";
+"room_access_space_chooser_other_spaces_section_info" = "Probablemente, otros administradores de %@ forman parte de ellos.";
+"create_room_suggest_room_footer" = "Se sugerirá a los usuarios del espacio unirse a las salas marcadas como sugeridas.";
+"create_room_section_footer_type_public" = "Solo las personas invitadas pueden encontrarla y unirse a ella, no solo la gente en Space name.";
+"room_access_settings_screen_upgrade_alert_message_no_param" = "Cualquiera en el espacio superior podrá encontrar esta sala y unirse a ella, no hace falta que invites a todo el mundo manualmente. Podrás cambiar esto en los ajustes de la sala.";
+"threads_notice_information" = "Los temas creados durante el periodo de pruebas ahora <b>aparecerán como respuestas ordinarias</b>.<br/><br/>Esto solo va a pasar esta vez, ya que los hilos son ahora parte de la especificación de Matrix.";
+"suggest" = "Sugerir";
+"existing" = "Existente";
+"joining" = "Entrando";
+"room_participants_invite_prompt_to_msg" = "¿Seguro que quieres invitar a %@ a %@?";
+"room_details_promote_room_title" = "Promocionar sala";
+"create_room_section_footer_type_restricted" = "Cualquiera en el espacio puede encontrarla y unirse.";
+"live_location_sharing_ended" = "Fin de la ubicación en tiempo real";
+"location_sharing_live_no_user_locations_error_title" = "Ninguna ubicación de usuarios disponible";
+"location_sharing_live_stop_sharing_progress" = "Dejar de compartir ubicación";
+"location_sharing_live_stop_sharing_error" = "Fallo al dejar de compartir ubicación";
+"location_sharing_live_timer_selector_long" = "8 horas";
+"location_sharing_live_timer_selector_medium" = "1 hora";
+"location_sharing_live_timer_selector_short" = "15 minutos";
+"location_sharing_live_timer_selector_title" = "Elige cuánto tiempo quieres que los demás vean tu ubicación precisa.";
+"location_sharing_live_error" = "Error en la ubicación en tiempo real";
+"location_sharing_live_loading" = "Cargando ubicación en tiempo real…";
--- a/Riot/Assets/et.lproj/Localizable.strings
+++ b/Riot/Assets/et.lproj/Localizable.strings
@@ -7,7 +7,6 @@
 /* New message from a specific person in a named room. Content included. */
 "MSG_FROM_USER_IN_ROOM_WITH_CONTENT" = "%@ kirjutas jututoas %@: %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ saatis pildi %@";
 /* A single unread message in a room */
 "SINGLE_UNREAD_IN_ROOM" = "Sa said sõnumi jututoas %@";
 /* A single unread message */
--- a/Riot/Assets/et.lproj/Vector.strings
+++ b/Riot/Assets/et.lproj/Vector.strings
@@ -742,8 +742,6 @@
 "directory_cell_title" = "Sirvi kataloogi";
 "directory_cell_description" = "%tu jututuba";
 "directory_search_results_title" = "Sirvi tulemusi kataloogist";
-"directory_search_results" = "%@ kohta leidsin %tu tulemust";
-"directory_search_results_more_than" = ">%@ kohta leidsin %tu tulemust";
 "directory_searching_title" = "Otsin kataaloogist…";
 "directory_search_fail" = "Andmete laadimine ei õnnestunud";
 // Contacts
@@ -777,7 +775,6 @@
 "gdpr_consent_not_given_alert_review_now_action" = "Vaata üle";
 // Service terms
 "service_terms_modal_title" = "Kasutustingimused";
-"service_terms_modal_message" = "Jätkamaks pead nõustuma selle teenuse kasutustingimustega(%@).";
 "service_terms_modal_accept_button" = "Nõustu";
 "service_terms_modal_decline_button" = "Keeldu";
 "service_terms_modal_description_for_identity_server_1" = "Leia teisi kasutajaid telefoninumbri või e-posti aadressi alusel";
@@ -785,7 +782,6 @@
 "service_terms_modal_description_for_integration_manager" = "Kasuta roboteid, võrgusildu, vidinaid või kleepsupakke";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Kasutajate leidmine";
-"service_terms_modal_message_identity_server" = "Väliste kasutajate leidmiseks pead nõustuma isikutuvastusserveri (%@) kasutustingimustega.";
 "service_terms_modal_policy_checkbox_accessibility_hint" = "Nõustumaks %@ tingimustega tee siia märge";
 "key_backup_setup_skip_alert_message" = "Kui sa logid välja või kaotad seadme, siis sa ei saa enam lugeda oma krüptitud sõnumeid.";
 "key_backup_setup_intro_info" = "Sõnumid krüptitud jututubades kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.\n\nVältimaks krüptovõtmete kadumist, varunda nad turvaliselt.";
@@ -988,7 +984,6 @@
 "room_details_addresses_disable_main_address_prompt_msg" = "Sel jututoal ei saa olema põhiaadressi. Seetõttu valitakse vaikimisi põhiaadress juhuslikult";
 "room_details_flair_section" = "Näita kogukondade rinnasilte";
 // Crash report
-"google_analytics_use_prompt" = "Kas sa soovid aitata parandada %@ rakendust saates arendajatele automaatseid ja anonüümsed veateateid ning kasutusteavet?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ nüüd toetab läbivat krüptimist ning selle kasutusele võtmiseks peaksid sa uuesti sisse logima.\n\nSa võid teha seda kohe või määrata rakenduse seadistustes.";
 "e2e_need_log_in_again" = "Selle sessiooni läbiva krüptimise võtmete loomiseks ja avaliku võtme salvestamiseks koduserverisse peaksid sa uuesti sisse logima.\nVabandame ebamugavuse pärast, aga see õnneks on ühekordne toiming.";
@@ -1146,19 +1141,19 @@
 "searchable_directory_x_network" = "%@ võrk";
 "searchable_directory_search_placeholder" = "Nimi või Matrix'i tunnus";
 "create_room_title" = "Uus jututuba";
-"create_room_section_header_name" = "Jututoa nimi";
+"create_room_section_header_name" = "NIMI";
 "create_room_placeholder_name" = "Nimi";
-"create_room_section_header_topic" = "Jututoa teema (kui soovid lisada)";
-"create_room_placeholder_topic" = "Jututoa teema";
-"create_room_section_header_encryption" = "Krüptimine jututoas";
+"create_room_section_header_topic" = "TEEMA (kui soovid lisada)";
+"create_room_placeholder_topic" = "Millest siin jututoas räägitakse?";
+"create_room_section_header_encryption" = "KRÜPTIMINE";
 "create_room_enable_encryption" = "Võta krüptimine kasutusele";
 "create_room_section_footer_encryption" = "Krüptimist ei saa hiljem välja lülitada.";
-"create_room_section_header_type" = "Jututoa tüüp";
-"create_room_type_private" = "Omavaheline jututuba";
-"create_room_type_public" = "Avalik jututuba";
+"create_room_section_header_type" = "KES PÄÄSEB SIIA LIGI";
+"create_room_type_private" = "Privaatne jututuba (kutse alusel)";
+"create_room_type_public" = "Avalik jututuba (kõigile)";
 "create_room_section_footer_type" = "Omavahelise jututoaga saab liituda vaid kutsega.";
-"create_room_show_in_directory" = "Näita jututubade loendit";
-"create_room_section_header_address" = "Jututoa aadress";
+"create_room_show_in_directory" = "Näita jututubade loendis";
+"create_room_section_header_address" = "AADRESS";
 "create_room_placeholder_address" = "#torenimi:domeen.ee";
 "room_info_list_room_encrypted" = "See jututuba on läbivalt krüptitud";
 "room_info_list_one_member" = "1 liige";
@@ -1306,12 +1301,10 @@
 // Chat
 "room_slide_to_end_group_call" = "Viipa kõne lõpetamiseks kõigi jaoks";
 "callbar_only_single_active_group" = "Rühmakõnega liitumiseks puuduta (%@)";
-"space_beta_announce_information" = "Kogukonnakeskused on uus viis inimeste ja jututubade sidumiseks. Neid veel ei saa iOS'is kasutada, kuid nad on olemas %@'i veebirakenduses ja töölauarakenduses.";
 "space_beta_announce_subtitle" = "Uus versioon senistest kogukondadest";
 "space_beta_announce_title" = "Kogukonnakeskused saavad varsti olema ka siin";
 "space_beta_announce_badge" = "BEETA";
 "space_feature_unavailable_information" = "Kogukonnakeskused on uus viis inimeste ja jututubade sidumiseks.\n\nNad saavad varsti olema kasutusel ka siin keskkonnas. Kui praegu liitud mõne kogukonnakeskusega mõnes muus keskkonnas, siis pääsed ligi kõikidele seotud jututubadele ka siin.";
-"space_feature_unavailable_subtitle" = "Kogukonnakeskuseid ei saa iOS'is kasutada, kuid nad on olemas %@'i veebirakenduses ja töölauarakenduses";

 // Mark: - Spaces

@@ -1380,9 +1373,7 @@
 "version_check_modal_action_title_supported" = "Selge lugu";
 "version_check_modal_subtitle_supported" = "Me oleme arendanud %@'i kiiremaks ja mugavamaks. Sinu praegune iOS'i versioon ei oska kõiki neid uuendusi kasutada ja tema tugi on lõppemas.\nKui soovid kasutada %@'i kõiki võimalusi, siis palun uuenda oma iOS'i versiooni.";
 "version_check_modal_title_supported" = "Rakenduse kasutamise võimalus iOS'i versioonis %@ on lõppemas";
-"version_check_banner_subtitle_deprecated" = "Me oleme lõpetanud selle rakenduse toe IOS'i versioonis %@. Kui soovid kasutada %@'i kõiki võimalusi, siis palun uuenda oma iOS'i versiooni.";
 "version_check_banner_title_deprecated" = "Rakenduse kasutamise võimalus iOS'i versioonis %@ on lõppenud";
-"version_check_banner_subtitle_supported" = "Me üsna varsti lõpetame selle rakenduse toe IOS'i versioonis %@. Kui soovid kasutada %@'i kõiki võimalusi, siis palun uuenda oma iOS'i versiooni.";

 // Mark: - Version check

@@ -1419,7 +1410,7 @@
 "space_public_join_rule" = "Avalik kogukond";
 "space_private_join_rule" = "Privaatne kogukond";
 "space_participants_action_ban" = "Sea selles kogukonnakeskus suhtluskeeld";
-"space_participants_action_remove" = "Eemalda sellest kogukonnakeskusest";
+"space_participants_action_remove" = "Eemalda sellest kogukonnast";
 "spaces_coming_soon_detail" = "See funktsionaalsus pole siin rakenduses hetkel veel saadaval, aga üsna varsti saab olema. Seni saad sa seda toimingut teha %@'i töölauarakenduses.";
 "spaces_invites_coming_soon_title" = "Varsti lisandub kutsete saatmine";
 "spaces_add_rooms_coming_soon_title" = "Varsti on jututubade lisamine võimalik";
@@ -2067,7 +2058,6 @@
 "attachment_small_with_resolution" = "Väiksena %@ (~%@)";
 "attachment_size_prompt_message" = "Seadistustest saad määrata, et see funktsionaalsus pole kasutusel.";
 "attachment_size_prompt_title" = "Saatmiseks kinnita meedia suurus";
-"room_displayname_all_other_participants_left" = "%@ (lahkus(id))";
 "room_displayname_all_other_members_left" = "%@ (lahkus(id))";
 "attachment_unsupported_preview_message" = "See failitüüp ei ole toetatud.";
 "attachment_unsupported_preview_title" = "Eelvaate kuvamine ei õnnestu";
@@ -2077,3 +2067,202 @@
 "room_participants_leave_processing" = "Lahkumine";
 "notice_error_unformattable_event" = "** Sõnumi töötlemine ei õnnestu. Palun anna meile sellest veast teada";
 "settings_labs_use_only_latest_user_avatar_and_name" = "Sõnumite ajaloos leiduvate kasutajate puhul näita viimati kasutatud tunnuspilti ning nime";
+"ignore_user" = "Eira kasutajat";
+"location_sharing_pin_drop_share_title" = "Jaga seda asukohta";
+"location_sharing_static_share_title" = "Jaga minu praegust asukohta";
+"live_location_sharing_banner_stop" = "Lõpeta asukoha jagamine";
+"live_location_sharing_banner_title" = "Reaalajas asukoha jagamine on kasutusel";
+
+// MARK: Live location sharing
+
+"location_sharing_live_share_title" = "Jaga asukohta reaalajas";
+"side_menu_coach_message" = "Kõikide jututubade nägemiseks viipa paremale või klõpsi";
+"spaces_add_room_missing_permission_message" = "Sul pole õigusi siia kogukonda lisada jututubasid.";
+"spaces_creation_in_one_space" = "1's kogukonnas";
+"spaces_creation_in_many_spaces" = "%@ kogukonnas";
+"spaces_creation_in_spacename_plus_many" = "%@ ja veel %@'s kogukonnas";
+"spaces_creation_in_spacename_plus_one" = "%@ ja veel 1's kogukonnas";
+"spaces_creation_in_spacename" = "%@ kogukonnas";
+"spaces_creation_post_process_inviting_users" = "Kutsun kasutajaid %@ kogukonda";
+"spaces_creation_post_process_adding_rooms" = "%@ jututubade lisamine";
+"spaces_creation_post_process_creating_room" = "%@ loomine";
+"spaces_creation_post_process_uploading_avatar" = "Profiilipildi ehk avatari üleslaadimine";
+"spaces_creation_post_process_creating_space_task" = "%@ loomine";
+"spaces_creation_post_process_creating_space" = "Loon kogukonda";
+"spaces_creation_invite_by_username_message" = "Sa saad neile ka hiljem kutse saata.";
+"spaces_creation_invite_by_username_title" = "Kutsu oma kaasteelisi";
+"spaces_creation_invite_by_username" = "Kutsu kasutajanime alusel";
+"spaces_creation_add_rooms_message" = "Kuna see kogukond on vaid sinu jaoks, siis keegi teine ei saa sellest hetkel teada. Küll aga saad hiljem huvilisi lisada.";
+"spaces_creation_add_rooms_title" = "Mida sa soovid lisada?";
+"spaces_creation_sharing_type_me_and_teammates_detail" = "Privaatne kogukond sinu ja sinu kaasteeliste jaoks";
+"spaces_creation_sharing_type_me_and_teammates_title" = "Mina ja minu kaasteelised";
+"spaces_creation_sharing_type_just_me_detail" = "Privaatne kogukond jututubade koondamiseks";
+"spaces_creation_sharing_type_just_me_title" = "Vaid mina";
+"spaces_creation_sharing_type_message" = "Kontrolli, et vajalikel inimestel oleks ligipääs %@ kogukonda Sa võid seda hiljem muuta.";
+"spaces_creation_sharing_type_title" = "Kellega sa koos töötad?";
+"spaces_creation_email_invites_email_title" = "E-posti aadress";
+"spaces_creation_email_invites_message" = "Sa saad neile ka hiljem kutse saata.";
+"spaces_creation_email_invites_title" = "Kutsu oma kaasteelisi";
+"spaces_creation_new_rooms_support" = "Kasutajatugi";
+"spaces_creation_new_rooms_random" = "Juhuslik";
+"spaces_creation_new_rooms_general" = "Üldist";
+"spaces_creation_new_rooms_room_name_title" = "Jututoa nimi";
+"spaces_creation_new_rooms_message" = "Loome siis igaühe jaoks oma jututoa.";
+"spaces_creation_new_rooms_title" = "Mis teemal te kavatsete suhelda?";
+"spaces_creation_cancel_message" = "Sinu senitehtud muudatused jäävad salvestamata.";
+"spaces_creation_cancel_title" = "Kas jätame kogukonna loomise pooleli?";
+"spaces_creation_private_space_title" = "Sinu privaatne kogukond";
+"spaces_creation_public_space_title" = "Sinu avalik kogukond";
+"spaces_creation_address_already_exists" = "%@\nselline nimi on juba olemas";
+"spaces_creation_address_invalid_characters" = "%@\nsiin leidub valesid tähemärke";
+"spaces_creation_address_default_message" = "Sinu kogukond on nähtav siin\n%@";
+"spaces_creation_empty_room_name_error" = "Nimi on nõutav";
+"spaces_creation_address" = "Aadress";
+"spaces_creation_settings_message" = "Eristumiseks palun lisa natuke teavet. Sa saad seda hiljem muuta ja täiendada.";
+"spaces_creation_footer" = "Sa võid seda hiljem muuta";
+"spaces_creation_visibility_message" = "Olemasoleva kogukonnaga liitumiseks vajad sa kutset.";
+"spaces_creation_visibility_title" = "Missugust kogukonda sooviksid sa luua?";
+
+// Mark: - Space Creation
+
+"spaces_creation_hint" = "Kogukonnad on uus viis jututubade ja inimeste ühendamiseks.";
+"space_settings_current_address_message" = "Sinu kogukond on nähtav siin\n%@";
+"space_settings_update_failed_message" = "Kogukonna seadistuste muutmine ei õnnestunud. Kas proovime uuesti?";
+"space_settings_access_section" = "Kes pääsevad ligi siia kogukonda?";
+"space_topic" = "Kirjeldus";
+"space_public_join_rule_detail" = "Avaliku ligipääsuga kogukond";
+"spaces_add_space" = "Lisa kogukond";
+"spaces_add_room" = "Lisa jututuba";
+"spaces_invite_people" = "Kutsu teisi kasutajaid";
+"space_private_join_rule_detail" = "Liitumine vaid kutse alusel, sobib sulle ja sinu lähematele kaaslastele";
+"spaces_explore_rooms_one_room" = "1 jututuba";
+"spaces_explore_rooms_room_number" = "%@ jututuba";
+"spaces_create_space_title" = "Loo kogukond";
+"spaces_add_space_title" = "Loo kogukond";
+"space_invite_not_enough_permission" = "Sul pole õigusi siia kogukonda osalejate kutsumiseks";
+"room_invite_not_enough_permission" = "Sul pole õigusi siia jututuppa osalejate kutsumiseks";
+"room_invite_to_room_option_detail" = "Nad ei saa osalema %@ jututoas.";
+"room_invite_to_room_option_title" = "Vaid selle jututoaga";
+"room_invite_to_space_option_detail" = "Huvilised saavad uurida %@ kogukonda, kuid ei saa %@ kogukonnaga liituda.";
+"share_invite_link_space_text" = "Hei, liitu selle kogukonnaga - %@";
+"share_invite_link_room_text" = "Hei, liitu selle jututoaga - %@";
+
+// MARK: - Share invite link
+
+"share_invite_link_action" = "Jaga kutse linki";
+"create_room_processing" = "Loon jututuba";
+"create_room_suggest_room_footer" = "Soovitatavaid jututube tutvustatakse kogukonnas kui sellised, millega liitumine oleks hea mõte.";
+"create_room_suggest_room" = "Soovita kogukonna liikmetele";
+"create_room_show_in_directory_footer" = "See aitab kasutajatel jututuba leida ja sellega liituda.";
+"create_room_promotion_header" = "REKLAAM";
+"create_room_section_footer_type_restricted" = "Kõik kogukonna liikmed saavad leida ja liituda.";
+"create_room_section_footer_type_private" = "Jututuba saab leida ja sellega liituda vaid kutsete alusel.";
+"create_room_type_restricted" = "Kogukonna liikmed";
+"call_jitsi_unable_to_start" = "Rühmakõne alustamine ei õnnestunud";
+"room_suggestion_settings_screen_message" = "Soovitatavaid jututube tutvustatakse kogukonnas kui sellised, millega liitumine oleks hea mõte.";
+"room_suggestion_settings_screen_title" = "Lisa jututuba kogukonnas soovitatavate hulka";
+
+// Room suggestion Settings
+"room_suggestion_settings_screen_nav_title" = "Soovita jututuba";
+"room_access_space_chooser_other_spaces_section_info" = "Ilmselt on tegemist millegagi, kus %@ haldajad veel osalevad.";
+"room_access_space_chooser_other_spaces_section" = "Muud kogukonnad või jututoad";
+"room_access_space_chooser_known_spaces_section" = "Sulle teadaolevad kogukonnad, milles leidub %@";
+"room_access_settings_screen_setting_room_access" = "Seadistame ligipääsu jututuppa";
+"room_access_settings_screen_upgrade_alert_upgrading" = "Uuendan jututoa versiooni";
+"room_access_settings_screen_upgrade_alert_upgrade_button" = "Uuenda";
+"room_access_settings_screen_upgrade_alert_auto_invite_switch" = "Kutsu huvilisi automaatselt uude jututuppa";
+"room_access_settings_screen_upgrade_alert_title" = "Uuendan jututoa versiooni";
+"room_access_settings_screen_public_message" = "Kõik saavad jututuba leida ja sellega liituda.";
+"room_access_settings_screen_edit_spaces" = "Muuda kogukondi";
+"room_access_settings_screen_upgrade_required" = "Vajalik on uuendus";
+"room_access_settings_screen_restricted_message" = "Kõik kogukonna liikmed saavad leida ja liituda.\nJärgmisena pead valima lubatavad kogukonnad.";
+"room_access_settings_screen_private_message" = "Leidmine ja liitumine toimub vaid kutse alusel.";
+"room_access_settings_screen_message" = "Vali kes saavad %@ jututuba leida ja võivad temaga liituda.";
+"room_access_settings_screen_title" = "Kes pääsevad ligi siia jututuppa?";
+
+// Room Access Settings
+"room_access_settings_screen_nav_title" = "Ligipääs jututuppa";
+"room_details_promote_room_suggest_title" = "Soovita kogukonna liikmetele";
+"room_details_promote_room_title" = "Reklaami jututuba";
+"threads_notice_information" = "Kõik testperioodil loodud jutulõngad kuvatakse <b>tavaliste vastustena</b>.<br/><br/>Kuna jutulõngad on nüüd osa Matrix'i spetsifikatsioonist, siis see on ühekordne muudatus.";
+"room_details_access_row_title" = "Ligipääs";
+"settings_labs_enable_auto_report_decryption_errors" = "Automaatselt teata dekrüptimise vigadest";
+"room_preview_decline_invitation_options" = "Kas sa soovid keelduda kutsest või eirata kasutajat?";
+"threads_beta_cancel" = "Mitte praegu";
+"threads_beta_enable" = "Proovi nüüd";
+"threads_beta_information_link" = "Lisateave";
+"threads_beta_information" = "Halda vestlusi jutulõngadena.\n\nJutulõngad aitavad hoida vestlused teemakohastena ning mugavalt loetavatena. ";
+"threads_beta_title" = "Jutulõngad";
+"threads_notice_done" = "Selge lugu";
+"threads_notice_title" = "Jutulõngad ei ole enam katsetusjärgus! 🎉";
+"room_participants_invite_prompt_to_msg" = "Kas sa oled kindel, et soovid kutsuda %@ %@ jututuppa?";
+"onboarding_celebration_button" = "Alustame nüüd";
+"onboarding_celebration_message" = "Sinu eelistused on salvestatud.";
+"onboarding_celebration_title" = "Kõik on valmis!";
+"onboarding_avatar_accessibility_label" = "Profiilipilt";
+"onboarding_avatar_message" = "Sa võid seda hiljem alati muuta.";
+"onboarding_avatar_title" = "Lisa profiilipilt";
+"onboarding_display_name_max_length" = "Sinu kuvatav nimi peab olema lühem, kui 256 tähemärki";
+"onboarding_display_name_hint" = "Sa võid seda hiljem muuta";
+"onboarding_display_name_placeholder" = "Kuvatav nimi";
+"onboarding_display_name_message" = "Seda näidatakse sõnumite saatmisel.";
+"onboarding_display_name_title" = "Vali kuvatav nimi";
+"onboarding_personalization_skip" = "Jäta see samm vahele";
+"onboarding_personalization_save" = "Salvesta ja jätka";
+"onboarding_congratulations_home_button" = "Mine avalehele";
+"onboarding_congratulations_personalize_button" = "Isikupärasta oma profiili";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Sinu kasutajakonto %@ on nüüd olemas.";
+"onboarding_congratulations_title" = "Õnnitlused!";
+"saving" = "Salvestame";
+
+// Activities
+"loading" = "Laadime";
+"edit" = "Muuda";
+"suggest" = "Soovita";
+"add" = "Lisa";
+"existing" = "Olemasolev";
+"new_word" = "Uus";
+"stop" = "Peata";
+"joining" = "Liitun";
+
+// Mark: - Room invite
+
+"room_invite_to_space_option_title" = "Kasutajale %@";
+"location_sharing_live_list_item_last_update" = "Uuendamise välp: %@";
+"location_sharing_live_list_item_stop_sharing_action" = "Lõpeta asukoha jagamine";
+"location_sharing_live_list_item_current_user_display_name" = "Sina";
+"location_sharing_live_list_item_last_update_invalid" = "Viimase uuendamise aeg pole teada";
+"location_sharing_live_list_item_sharing_expired" = "Asukoha jagamine aegus";
+"location_sharing_live_list_item_time_left" = "kuvamisaega jäänud %@s";
+"location_sharing_live_viewer_title" = "Asukoht";
+"location_sharing_live_map_callout_title" = "Jaga asukohta";
+"create_room_section_footer_type_public" = "Jututuba saavad leida ja sellega liituda vaid need, kellel on kutse. See puudutab ka neid, kes pole kogukonna liikmed.";
+"version_check_banner_subtitle_deprecated" = "Me oleme lõpetanud selle rakenduse (%@) toe IOS'i versioonis %@. Kui soovid kasutada%@'i kõiki võimalusi, siis palun uuenda oma iOS'i versiooni.";
+"version_check_banner_subtitle_supported" = "Me üsna varsti lõpetame selle rakenduse (%@) toe IOS'i versioonis %@. Kui soovid kasutada %@'i kõiki võimalusi, siis palun uuenda oma iOS'i versiooni.";
+"space_beta_announce_information" = "Kogukonnad on uus viis inimeste ja jututubade sidumiseks. Neid veel ei saa iOS'is kasutada, kuid nad on olemas Element'i veebirakenduses ja töölauarakenduses.";
+"space_feature_unavailable_subtitle" = "Kogukondi ei saa iOS'is kasutada, kuid nad on olemas Element'i veebirakenduses ja töölauarakenduses";
+"room_access_settings_screen_upgrade_alert_note" = "Palun arvesta, et uuendusega tehakse jututoast uus variant. Kõik senised sõnumid jäävad sellesse jututuppa arhiveeritud olekus.";
+"room_access_settings_screen_upgrade_alert_message_no_param" = "Kõik hõlmava kogukonna liikmed saavad antud jututuba leida ja sellega liituda - sa ei pea kedagi ükshaaval kutsuma. Neid jututoa seadistusi saad igal hetkel muuta.";
+"room_access_settings_screen_upgrade_alert_message" = "Kõik %@ jututoa liikmed saavad antud jututuba leida ja sellega liituda - sa ei pea kedagi ükshaaval kutsuma. Neid jututoa seadistusi saad igal hetkel muuta.";
+"settings_presence_offline_mode_description" = "Kui see valik on kasutusel, siis sa alati oled teiste jaoks võrgust väljas. Seda ka siis, kui kasutad rakendust.";
+"settings_presence_offline_mode" = "Ei ole võrgus";
+"settings_presence" = "Olek võrgus";
+"threads_discourage_information_2" = "\n\nKas sa ikkagi soovid jutulõngad kasutusele võtta?";
+"threads_discourage_information_1" = "Sinu koduserver hetkel ei toeta jutulõngasid ning seega antud funktsionaalsus ei pruugi toimida korralikult. Kõik sõnumid jutulõngas ilmselt ei ole loetavad. ";
+"location_sharing_live_stop_sharing_progress" = "Lõpeta asukoha jagamine reaalajas";
+"location_sharing_live_stop_sharing_error" = "Asukoha jagamise lõpetamine ei õnnestunud";
+"location_sharing_live_no_user_locations_error_title" = "Kasutaja asukohad pole leitavad";
+"location_sharing_live_timer_selector_long" = "8 tunni kestel";
+"location_sharing_live_timer_selector_medium" = "1 tunni kestel";
+"location_sharing_live_timer_selector_short" = "15 minuti kestel";
+"location_sharing_live_timer_selector_title" = "Vali aeg, mille jooksul teised kasutajad näevad sinu täpset asukohta.";
+"location_sharing_live_error" = "Viga asukoha jagamisel reaalajas";
+"location_sharing_live_loading" = "Reaalajas asukoha laadmine...";
+"location_sharing_live_timer_incoming" = "Asukoha jagamine toimib kuni %@";
+"live_location_sharing_ended" = "Reaalajas asukoha jagamine on lõppenud";
+"confirm" = "Kinnita";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. Note the > at the start indicates "more than 20 results". */
+"directory_search_results_more_than" = ">%2$@ kohta leidsin %1$tu tulemust";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. */
+"directory_search_results" = "%2$@ kohta leidsin %1$tu tulemust";
--- a/Riot/Assets/eu.lproj/Localizable.strings
+++ b/Riot/Assets/eu.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ erabiltzaileak irudi bat bidali du  %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ erabiltzaileak irudi bat %@ bidali du %@ gelara";
 /* Multiple unread messages in a room */
--- a/Riot/Assets/eu.lproj/Vector.strings
+++ b/Riot/Assets/eu.lproj/Vector.strings
@@ -280,7 +280,6 @@
 // Chat
 "room_jump_to_first_unread" = "Jauzi irakurri gabeko lehen mezura";
 "room_new_message_notification" = "mezu berri %d";
-"room_new_messages_notification" = "$d mezu berri";
 "room_one_user_is_typing" = "%@ idazten ari da…";
 "room_two_users_are_typing" = "%@ eta %@ idazten ari dira…";
 "room_many_users_are_typing" = "%@, %@, eta beste batzuk idazten ari dira…";
@@ -404,7 +403,6 @@
 "no_voip_title" = "Deia jasotzen";
 "no_voip" = "%@ zu deitzen ari da baina %@(e)k ez ditu deiak onartzen oraindik.\nJakinarazpen hau ezikusi dezakezu eta deia beste gailu batetik hartu, edo deia baztertu.";
 // Crash report
-"google_analytics_use_prompt" = "%@ hobetzen lagundu nahi duzu kraskatze-txosten era erabilera datu anonimoak automatikoki bidaliz?";
 "e2e_need_log_in_again" = "Berriro hasi behar duzu saioa muturretik muturrerako zifratzerako saio honek gakoak sortzeko eta gako publikoa zure hasiera zerbitzarira bidali behar duzu.\nHau behin bakarrik egin behar duzu, barkatu eragozpenak.";
 "bug_crash_report_title" = "Kraskatze-txostena";
 "bug_crash_report_description" = "Azaldu zer zeunden egiten programa kraskatu aurretik:";
@@ -660,10 +658,6 @@
 "room_message_unable_open_link_error_message" = "Ezin izan da esteka ireki.";
 "room_event_action_reply" = "Erantzun";
 "room_event_action_edit" = "Editatu";
-"room_event_action_reaction_agree" = "Ados  %@";
-"room_event_action_reaction_disagree" = "Ez ados %@";
-"room_event_action_reaction_like" = "Gogokoa  %@";
-"room_event_action_reaction_dislike" = "Ez gogokoa %@";
 "room_action_reply" = "Erantzun";
 "settings_key_backup_button_connect" = "Konektatu saio hau gakoen babes-kopiara";
 "key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Konektatu gailu hau gakoen babes-kopiara";
@@ -807,7 +801,6 @@
 "photo_library_access_not_granted" = "%@(e)k ez du argazki liburutegia erabiltzeko baimenik, aldatu pribatutasun ezarpenak";
 // Service terms
 "service_terms_modal_title" = "Erabilera baldintzak";
-"service_terms_modal_message" = "Jarraitzeko, zerbitzu honen erabilera baldintzak onartu behar dituzu (%@).";
 "service_terms_modal_accept_button" = "Onartu";
 "service_terms_modal_description_for_identity_server" = "Izan besteentzat aurkigarria";
 "service_terms_modal_description_for_integration_manager" = "Erabili botak, zubiak, trepetak eta eranskailu multzoak";
@@ -891,7 +884,6 @@
 "service_terms_modal_description_for_identity_server_2" = "Izan telefonoa edo e-maila erabiliz aurkigarria";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Kontaktuak aurkitzea";
-"service_terms_modal_message_identity_server" = "Onartu %@ identitate-zerbitzariaren baldintzak kontaktuak aurkitzeko.";
 // Generic errors
 "error_invite_3pid_with_no_identity_server" = "Gehitu identitate-zerbitzari bat zure ezarpenetan e-maila erabiliz gonbidatzeko.";
 "settings_add_3pid_password_title_email" = "Gehitu e-mail helbidea";
@@ -901,7 +893,6 @@
 "error_not_supported_on_mobile" = "Ezin duzu hau %@ mugikorretik egin.";
 "settings_integrations" = "INTEGRAZIOAK";
 "settings_integrations_allow_button" = "Kudeatu integrazioak";
-"settings_integrations_allow_description" = "Erabili integrazio kudeatzaileren bat botak, zubiak, trepetak eta eranskailu multzoak kudeatzeko.\n\nIntegrazio kudeatzaileek konfigurazio datuak jasotzen dituzte, eta trepetak aldatu ditzakete, gelarako gonbidapenak bidali, eta botere mailak zure izenean ezarri.";
 "widget_menu_refresh" = "Freskatu";
 "widget_menu_open_outside" = "Ireki nabigatzailean";
 "widget_menu_revoke_permission" = "Indargabetu sarbidea niretzat";
@@ -1033,7 +1024,6 @@
 "security_settings_complete_security_alert_message" = "Aurretik segurtasuna osatu beharko zenuke oraingo saioan.";
 "security_settings_coming_soon" = "Sentitzen dugu. Ekintza hau ez dago iOS plataformarako %@ bezeroan eskuragarri oraindik. Erabili beste Matrix bezero bat ezartzeko. %@ iOS-ek erabili egingo du.";
 "device_verification_self_verify_wait_new_sign_in_title" = "Egiaztatu saio hau";
-"device_verification_self_verify_wait_additional_information" = "edo zeharkako sinadurarako gai den beste Matrix bezero bat";
 // Scanning
 "key_verification_scan_confirmation_scanning_title" = "Ia bukatu duzu! Baieztapenaren zain…";
 "key_verification_scan_confirmation_scanning_user_waiting_other" = "%@ itxaroten…";
@@ -1114,7 +1104,6 @@
 // room display name
 "room_displayname_empty_room" = "Gela hutsa";
 "room_displayname_two_members" = "%@ eta %@";
-"room_displayname_more_than_two_members" = "%@ eta beste %u";
 // Settings
 "settings" = "Ezarpenak";
 // button names 
@@ -1253,7 +1242,6 @@
 "unignore" = "Berriro aintzat hartu";
 "notice_room_name_removed" = "%@ erabiltzaileak gelaren izena kendu du";
 "notice_room_topic_removed" = "%@ erabiltzaileak gelaren mintzagaia kendu du";
-"notice_event_redacted" = "<kenduta %1$s>";
 "notice_event_redacted_by" = " nork: %@";
 "notice_event_redacted_reason" = " [arrazoia: %@]";
 "notice_room_created" = "%@ erabiltzaileak gela sortu du";
@@ -1322,7 +1310,6 @@
 "notification_settings_people_join_leave_rooms" = "Jakinarazi niri jendea gelera elkartu edo gelatik ateratzean";
 "notice_room_power_level_event_requirement" = "Gertaerekin lotutako gutxieneko botere maila:";
 "notice_room_aliases" = "Gelaren ezizenak: %@";
-"notice_encryption_enabled" = "%@ erabiltzaileak muturretik muturrera zifratzea gaitu du (%@ algoritmoa)";
 "notice_redaction" = "%@ erabiltzaileak gertaera bat kendu du (id: %@)";
 "notice_error_unsupported_event" = "Onartu gabeko gertaera";
 "notice_error_unexpected_event" = "Ustekabeko gertaera";
--- a/Riot/Assets/fa.lproj/Vector.strings
+++ b/Riot/Assets/fa.lproj/Vector.strings
@@ -217,7 +217,6 @@
 // Room Preview
 "room_preview_invitation_format" = "شما توسط %@ برای پیوستن به این اتاق دعوت شده اید";
 "room_title_one_member" = "۱ عضو";
-"room_title_members" = "٪@ اعضا";
 "room_title_invite_members" = "دعوت از اعضا";
 "room_title_one_active_member" = "%@/%@ عضو فعال";
 "room_title_multiple_active_members" = "%@/%@ اعضای فعال";
@@ -228,7 +227,6 @@
 "unknown_devices_answer_anyway" = "به هر حال پاسخ دهید";
 "unknown_devices_call_anyway" = "به هر حال تماس بگیرید";
 "unknown_devices_send_anyway" = "به هر حال ارسال کنید";
-"room_multiple_typing_notification" = "٪@ و دیگران";
 "external_link_confirmation_message" = "پیوند %@ شما را به سایت دیگری انتقال می دهد: %@\n\nآیا مطمئن هستید که میخواهید ادامه دهید؟";
 "external_link_confirmation_title" = "این لینک را دوبار بررسی کنید";
 "media_type_accessibility_sticker" = "استیکر";
@@ -393,7 +391,6 @@

 // Call
 "call_incoming_voice_prompt" = "تماس صوتی ورودی از %@";
-"room_does_not_exist" = "٪@ وجود ندارد";
 "photo_library_access_not_granted" = "%@ اجازه دسترسی به عکس های دستگاه شما را ندارد، لطفاً تنظیمات حریم خصوصی را تغییر دهید";
 "camera_unavailable" = "دوربین در دستگاه شما قابل دسترسی نیست";
 "camera_access_not_granted" = "%@ اجازه استفاده از دوربین را ندارد، لطفاً تنظیمات حریم خصوصی را تغییر دهید";
@@ -410,11 +407,8 @@
 "or" = "یا";
 "event_formatter_jitsi_widget_removed_by_you" = "کنفرانس VoIP را حذف کردید";
 "event_formatter_jitsi_widget_added_by_you" = "شما کنفرانس VoIP را اضافه کردید";
-"event_formatter_widget_removed_by_you" = "ویجت را حذف کردید:@%";

 // Events formatter with you
-"event_formatter_widget_added_by_you" = "ویجت را اضافه کردید:@ %";
-"event_formatter_group_call_incoming" = "@٪ در@ ٪";
 "event_formatter_group_call_leave" = "ترک";
 "event_formatter_group_call_join" = "پیوستن";
 "event_formatter_group_call" = "تماس گروهی";
--- a/Riot/Assets/fi.lproj/Vector.strings
+++ b/Riot/Assets/fi.lproj/Vector.strings
@@ -46,7 +46,6 @@
 // Directory
 "directory_title" = "Luettelo";
 "directory_server_picker_title" = "Valitse luettelo";
-"major_update_title" = "Riot on nyt Element";
 "major_update_learn_more_action" = "Lue lisää";
 "major_update_done_action" = "Selvä";
 "room_member_power_level_short_moderator" = "Valvoja";
--- a/Riot/Assets/fr.lproj/Localizable.strings
+++ b/Riot/Assets/fr.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@ : * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ a envoyé une image %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ a posté une image %@ dans %@";
 /* A single unread message in a room */
--- a/Riot/Assets/fr.lproj/Vector.strings
+++ b/Riot/Assets/fr.lproj/Vector.strings
@@ -130,8 +130,8 @@
 "directory_cell_title" = "Parcourir le répertoire";
 "directory_cell_description" = "%tu salons";
 "directory_search_results_title" = "Parcourir les résultats dans le répertoire";
-"directory_search_results" = "%tu résultats trouvés pour %@";
-"directory_search_results_more_than" = ">%tu résultats trouvés pour %@";
+"directory_search_results" = "%1$tu résultats trouvés pour %2$@";
+"directory_search_results_more_than" = ">%1$tu résultats trouvés pour %2$@";
 "directory_searching_title" = "Recherche dans le répertoire…";
 "directory_search_fail" = "Impossible de récupérer les données";
 // Contacts
@@ -420,7 +420,6 @@
 "no_voip_title" = "Appel entrant";
 "no_voip" = "%@ vous appelle mais %@ ne prend pas encore en charge les appels.\nVous pouvez ignorer cette notification et répondre à l’appel depuis un autre appareil, ou bien le rejeter.";
 // Crash report
-"google_analytics_use_prompt" = "Souhaitez-vous aider à améliorer %@ en envoyant automatiquement des rapports d’anomalie et des statistiques d’utilisation ?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ prend désormais en charge le chiffrement de bout en bout, mais vous devez vous reconnecter pour l’activer.\n\nVous pouvez le faire maintenant ou plus tard à partir des paramètres de l’application.";
 "e2e_need_log_in_again" = "Vous devez vous reconnecter pour générer les clés de chiffrement de bout en bout pour cette session et envoyer la clé publique vers votre serveur d’accueil.\nCeci ne se produira qu’une fois. Veuillez nous excuser pour ce désagrément.";
@@ -561,7 +560,6 @@
 "settings_key_backup_info_not_valid" = "Cette session ne sauvegarde pas vos clés, mais vous avez une sauvegarde existante que vous pouvez restaurer et joindre.";
 "settings_key_backup_info_progress" = "Sauvegarde de %@ clés…";
 "settings_key_backup_info_progress_done" = "Toutes les clés ont été sauvegardées";
-"settings_key_backup_info_not_trusted_from_verifiable_device_fix_action" = "Pour utiliser la récupération de messages sécurisée sur cet appareil, vérifiez %@ maintenant.";
 "settings_key_backup_info_not_trusted_fix_action" = "Pour utiliser la récupération de messages sécurisée sur cet appareil, fournissez votre phrase de passe ou votre clé de récupération maintenant.";
 "settings_key_backup_info_trust_signature_unknown" = "La sauvegarde a une signature de la session ayant pour identifiant : %@";
 "settings_key_backup_info_trust_signature_valid" = "La sauvegarde a une signature valide depuis cette session";
@@ -672,10 +670,6 @@
 "auth_autodiscover_invalid_response" = "Réponse de découverte du serveur d’accueil non valide";
 "room_event_action_reply" = "Répondre";
 "room_event_action_edit" = "Modifier";
-"room_event_action_reaction_agree" = "D’accord %@";
-"room_event_action_reaction_disagree" = "Pas d’accord %@";
-"room_event_action_reaction_like" = "J’aime %@";
-"room_event_action_reaction_dislike" = "J’aime pas %@";
 "room_action_reply" = "Répondre";
 "settings_labs_message_reaction" = "Réagir aux messages avec des émojis";
 "settings_key_backup_button_connect" = "Connecter cette session à la sauvegarde de clés";
@@ -821,7 +815,6 @@
 "room_participants_start_new_chat_error_using_user_email_without_identity_server" = "Aucun serveur d’identité n’est configuré donc vous ne pouvez pas commencer de discussion avec un contact en utilisant un e-mail.";
 // Service terms
 "service_terms_modal_title" = "Conditions de service";
-"service_terms_modal_message" = "Pour continuer vous devez accepter les conditions de ce service (%@).";
 "service_terms_modal_accept_button" = "Accepter";
 "service_terms_modal_description_for_identity_server" = "Se rendre découvrable pour les autres";
 "service_terms_modal_description_for_integration_manager" = "Utiliser des robots, des passerelles, des widgets et des jeux d’autocollants";
@@ -905,7 +898,6 @@
 "service_terms_modal_description_for_identity_server_2" = "Être trouvé par téléphone ou par e-mail";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Découverte des contacts";
-"service_terms_modal_message_identity_server" = "Acceptez les conditions du serveur d’identité (%@) pour découvrir des contacts.";
 "settings_add_3pid_password_title_email" = "Ajouter une adresse e-mail";
 "settings_add_3pid_password_title_msidsn" = "Ajouter un numéro de téléphone";
 "settings_add_3pid_password_message" = "Pour continuer, saisissez le mot de passe de votre compte Matrix";
@@ -921,7 +913,6 @@
 "widget_integration_manager_disabled" = "Vous devez activer le gestionnaire d’intégrations dans les paramètres";
 "widget_room_permission_title" = "Charger le widget";
 "widget_room_permission_creator_info_title" = "Ce widget a été ajouté par :";
-"widget_room_permission_information" = "Son utilisation peut utiliser des cookies et partager des données avec %@ :\n\n• Votre nom affiché\n• L’URL de votre avatar\n• Votre identifiant d’utilisateur\n• Votre thème\n• L’identifiant du salon\n• L’identifiant du widget";
 // Room widget permissions
 "room_widget_permission_title" = "Charger un widget";
 "room_widget_permission_creator_info_title" = "Ce widget a été ajouté par :";
@@ -1640,7 +1631,6 @@
 "poll_edit_form_update_failure_subtitle" = "Veuillez réessayer";
 "poll_edit_form_update_failure_title" = "Échec lors de la mise à jour du sondage";
 "poll_edit_form_poll_type" = "Type de sondage";
-"location_sharing_post_failure_subtitle" = "%# n’a pas pu envoyer votre localisation. Merci de réessayer plus tard.";
 "location_sharing_post_failure_title" = "Nous n’avons pas pu envoyer votre localisation";
 "home_context_menu_leave" = "Partir";
 "home_context_menu_unfavourite" = "Retirer des favoris";
@@ -1768,7 +1758,6 @@
 "notice_room_aliases" = "Les alias du salon sont : %@";
 "notice_room_related_groups" = "Les groupes associés à ce salon sont : %@";
 "notice_encrypted_message" = "Message chiffré";
-"notice_encryption_enabled" = "%@ a activé le chiffrement de bout en bout (algorithme %@)";
 "notice_image_attachment" = "image en pièce-jointe";
 "notice_audio_attachment" = "audio en pièce-jointe";
 "notice_video_attachment" = "vidéo en pièce-jointe";
@@ -1789,7 +1778,6 @@
 // room display name
 "room_displayname_empty_room" = "Salon vide";
 "room_displayname_two_members" = "%@ et %@";
-"room_displayname_more_than_two_members" = "%@ et %u autres";
 // Settings
 "settings" = "Paramètres";
 "settings_enable_inapp_notifications" = "Activer les notifications dans l’application";
@@ -2154,3 +2142,49 @@
 "room_participants_leave_processing" = "Départ";
 "notice_error_unformattable_event" = "** Impossible d’afficher le message. Merci de signaler une erreur";
 "home_syncing" = "Synchronisation";
+"room_details_access_row_title" = "Accéder";
+"settings_presence_offline_mode_description" = "Si active, vous apparaîtrez toujours hors-ligne aux autres utilisateurs, même lorsque vous utilisez l’application.";
+"settings_presence_offline_mode" = "Mode hors-ligne";
+"settings_presence" = "Présence";
+"settings_labs_enable_auto_report_decryption_errors" = "Rapports automatiques d’erreurs de déchiffrement";
+"room_preview_decline_invitation_options" = "Voulez-vous ignorer l’invitation ou ignorer l’utilisateur ?";
+"threads_discourage_information_2" = "\n\nVoulez-vous tout de même activer les fils de discussion ?";
+"threads_discourage_information_1" = "Votre serveur d’accueil ne prend pas en charge les fils de discussion, cette fonctionnalité pourrait ne pas être fiable. Certains messages dans les fils pourraient ne pas s’afficher. ";
+"threads_beta_cancel" = "Pas maintenant";
+"threads_beta_enable" = "Essayer";
+"threads_beta_information_link" = "En apprendre plus";
+"threads_beta_information" = "Gardez vos conversations organisées avec les fils de discussion.\n\nLes fils de discussion cadrent les conversations et permettent de s’y retrouver plus facilement. ";
+"threads_beta_title" = "Fils de discussion";
+"threads_notice_done" = "Compris";
+"threads_notice_information" = "Tous les fils de discussion créés pendant la période d’expérimentation seront désormais <b>affichés comme de simples réponses</b>.<br/><br/>Il s’agit d’une transition unique puisque les fils de discussion font désormais partie de la spécification Matrix.";
+"threads_notice_title" = "Les fils de discussions ne sont plus une fonctionnalité expérimentale 🎉";
+"room_participants_invite_prompt_to_msg" = "Êtes vous sûr de vouloir inviter %@ dans %@ ?";
+"onboarding_celebration_button" = "C’est parti";
+"onboarding_celebration_message" = "Vos préférences ont été enregistrées.";
+"onboarding_celebration_title" = "Tout est prêt !";
+"onboarding_avatar_accessibility_label" = "Photo de profil";
+"onboarding_avatar_message" = "Vous pouvez la changer n’importe quand.";
+"onboarding_avatar_title" = "Ajoutez un photo de profil";
+"onboarding_display_name_max_length" = "Votre nom d’affichage doit faire moins de 256 caractères";
+"onboarding_display_name_hint" = "Vous pouvez le changer plus tard";
+"onboarding_display_name_placeholder" = "Nom d’affichage";
+"onboarding_display_name_message" = "Il sera affiché lorsque vous envoyez des messages.";
+"onboarding_display_name_title" = "Choisissez un nom d’affichage";
+"onboarding_personalization_skip" = "Passer cette étape";
+"onboarding_personalization_save" = "Enregistrer et poursuivre";
+"onboarding_congratulations_home_button" = "Aller à l’écran d’accueil";
+"onboarding_congratulations_personalize_button" = "Personnaliser le profil";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "Votre compte %@ a été créé.";
+"onboarding_congratulations_title" = "Félicitations !";
+"saving" = "Enregistrement";
+
+// Activities
+"loading" = "Chargement";
+"confirm" = "Confirmer";
+"edit" = "Modifier";
+"suggest" = "Suggérer";
+"add" = "Ajouter";
+"existing" = "Existant";
+"new_word" = "Nouveau";
+"stop" = "Arrêter";
--- a/Riot/Assets/he.lproj/Localizable.strings
+++ b/Riot/Assets/he.lproj/Localizable.strings
@@ -1 +1,169 @@

+
+
+/** Key verification **/
+
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ רוצה לאמת";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (שיחה קבוצתית)";
+
+/* A user added a Jitsi call to a room */
+"GROUP_CALL_STARTED" = "שיחה קבוצתית החלה";
+
+/* Incoming named video conference invite from a specific person */
+"VIDEO_CONF_NAMED_FROM_USER" = "שיחת וידאו קבוצתית מ %@: '%@'";
+
+/* Incoming named voice conference invite from a specific person */
+"VOICE_CONF_NAMED_FROM_USER" = "שיחה קבוצתית מ %@: '%@'";
+
+/* Incoming unnamed video conference invite from a specific person */
+"VIDEO_CONF_FROM_USER" = "שיחת וידאו קבוצתית מ %@";
+
+/* Incoming unnamed voice conference invite from a specific person */
+"VOICE_CONF_FROM_USER" = "שיחה קבוצתית מ %@";
+
+/* Incoming one-to-one video call */
+"VIDEO_CALL_FROM_USER" = "שיחת וידאו מ %@";
+
+/** Calls **/
+
+/* Incoming one-to-one voice call */
+"VOICE_CALL_FROM_USER" = "שיחה מ %@";
+
+/* A user's membership has updated in an unknown way */
+"USER_MEMBERSHIP_UPDATED" = "%@ שינו את הפרופיל שלהם";
+
+/* A user has change their avatar */
+"USER_UPDATED_AVATAR" = "%@ שינו את הדמות שלהם";
+
+/* A user has change their name to a new name which we don't know */
+"GENERIC_USER_UPDATED_DISPLAYNAME" = "%@ שינה את שמם";
+
+/** Invites **/
+
+/* A user has invited you to a chat */
+"USER_INVITE_TO_CHAT" = "%@ הזמין אותך לצ'אט";
+
+/* Multiple unread messages from three people */
+"MSGS_FROM_THREE_USERS" = "%@ הודעה חדשה מ %@, %@ ו %@";
+
+/** Membership Updates **/
+
+/* A user has change their name to a new name */
+"USER_UPDATED_DISPLAYNAME" = "%@ שינה את שמו ל %@";
+
+/* A user has invited you to a named room */
+"USER_INVITE_TO_NAMED_ROOM" = "%@ הזמין אותך ל %@";
+
+/* A user has invited you to an (unamed) group chat */
+"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ הזמין לצ'אט קבוצתי";
+
+/* A user has reacted to a message, but the reaction content is unknown */
+"GENERIC_REACTION_FROM_USER" = "%@ שלח תגובה";
+
+/** Reactions **/
+
+/* A user has reacted to a message, including the reaction e.g. "Alice reacted 👍". */
+"REACTION_FROM_USER" = "%@ הגיב %@";
+
+/* Look, stuff's happened, alright? Just open the app. */
+"MSGS_IN_TWO_PLUS_ROOMS" = "%@ הודעות חדשות ב %@, %@ ואחרים";
+
+/* Multiple messages in two rooms */
+"MSGS_IN_TWO_ROOMS" = "%@ הודעה חדשה ב %@ ו %@";
+
+/* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
+"MSGS_FROM_TWO_PLUS_USERS" = "%@ הודעה חדשה מ %@, %@ ואחרים";
+
+/* Multiple unread messages from two people */
+"MSGS_FROM_TWO_USERS" = "%@ הודעה חדשה מ %@ ו %@";
+
+/* Multiple unread messages from a specific person, not referencing a room */
+"MSGS_FROM_USER" = "%@ הודעה חדשה ב %@";
+
+/** Coalesced messages **/
+
+/* Multiple unread messages in a room */
+"UNREAD_IN_ROOM" = "%@ הודעה חדשה ב %@";
+
+/* New message with hidden content due to PIN enabled */
+"MESSAGE_PROTECTED" = "הודעה חדשה";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "הודעה ב %@";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "הודעה מ %@";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "הודעה";
+
+/* Sticker from a specific person, not referencing a room. */
+"STICKER_FROM_USER" = "%@ נשלחה מדבקה";
+
+/* A single unread message */
+"SINGLE_UNREAD" = "קיבלת הודעה";
+
+/* A single unread message in a room */
+"SINGLE_UNREAD_IN_ROOM" = "קיבלת הודעה ב %@";
+
+/* New file message from a specific person, not referencing a room. */
+"LOCATION_FROM_USER" = "%@ שיתף את מיקומו";
+
+/* New file message from a specific person, not referencing a room. */
+"FILE_FROM_USER" = "%@ שלח קובץ %@";
+
+/* New voice message from a specific person, not referencing a room. */
+"VOICE_MESSAGE_FROM_USER" = "%@ שלח הודעה קולית";
+
+/* New audio message from a specific person, not referencing a room. */
+"AUDIO_FROM_USER" = "%@ שלח קובץ קולי %@";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ שלח סירטון";
+
+/* New image message from a specific person in a named room. */
+"IMAGE_FROM_USER_IN_ROOM" = "%@ פירסם תמונה %@ ב %@";
+
+/** Media Messages **/
+
+/* New image message from a specific person, not referencing a room. */
+"PICTURE_FROM_USER" = "%@ שלח תמונה";
+
+/* New action message from a specific person in a named room. */
+"ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
+
+/* New action message from a specific person, not referencing a room. */
+
+/* New message from a specific person in a named room. Content included. */
+"MSG_FROM_USER_IN_ROOM_WITH_CONTENT" = "%@ ב %@: %@";
+
+/** Single, unencrypted messages (where we can include the content */
+
+/* New message from a specific person, not referencing a room. Content included. */
+"MSG_FROM_USER_WITH_CONTENT" = "%@: %@";
+
+/* New message from a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM" = "%@ פורסם ב %@";
+
+/** Single, end-to-end encrypted messages (ie. we don't know what they say) */
+
+/* New message from a specific person, not referencing a room */
+"MSG_FROM_USER" = "%@ שלח הודעה";
+
+/* New message reply from a specific person in a named room. */
+"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ השיב ב %@";
+
+/* New message reply from a specific person, not referencing a room. */
+"REPLY_FROM_USER_TITLE" = "%@ השיב";
+
+/** Titles **/
+
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ בתוך %@";
+/** General **/
+
+"Notification" = "הודעה";
--- a/Riot/Assets/he.lproj/Vector.strings
+++ b/Riot/Assets/he.lproj/Vector.strings
@@ -307,7 +307,6 @@
 "event_formatter_widget_removed" = "יישומון %@ הוסר ע\"י %@";

 // Events formatter
-"event_formatter_member_updates" = "% שינויי חברות";
 "directory_server_placeholder" = "matrix.org";
 "directory_server_type_homeserver" = "הקלד שרת בית על מנת להציג רשימת חדרים ממנו";
 "directory_server_all_native_rooms" = "כל חדרי מטריקס המקוריים";
@@ -347,9 +346,7 @@
 // Group participants
 "group_participants_add_participant" = "הוסף משתתף";
 "group_invitation_format" = "%@ הזמין אותך להצטרף לקהילה זו";
-"group_home_multi_rooms_format" = "% חדרים";
 "group_home_one_room_format" = "חדר 1";
-"group_home_multi_members_format" = "% חברים";

 // Group Home
 "group_home_one_member_format" = "חבר 1";
@@ -778,8 +775,6 @@
 "room_many_users_are_typing" = "%@, %@ וגם אחרים מקלידים…";
 "room_two_users_are_typing" = "%@ & %@ מקלידים…";
 "room_one_user_is_typing" = "%@ מקליד…";
-"room_new_messages_notification" = "%@ הודעות חדשות";
-"room_new_message_notification" = "%@ הודעה חדשה";
 "room_accessiblity_scroll_to_bottom" = "גלול לתחתית";
 "room_jump_to_first_unread" = "עבור ללא נקרא";

@@ -845,7 +840,6 @@
 "room_participants_leave_prompt_msg" = "האם אתה בטוח שברצונך לעזוב את החדר?";
 "room_participants_leave_prompt_title_for_dm" = "עזוב";
 "room_participants_leave_prompt_title" = "עזוב חדר";
-"room_participants_multi_participants" = "%@ משתתפים";
 "room_participants_one_participant" = "משתתף 1";
 "room_participants_add_participant" = "הוסף משתתף";

@@ -869,10 +863,7 @@
 // Contacts
 "contacts_address_book_section" = "אנשי קשר מקומיים";
 "directory_searching_title" = "מחפש ספריות…";
-"directory_search_results_more_than" = ">% תוצאות נמצאו עבור %@";
-"directory_search_results" = "% תוצאות נמצאו עבור %@";
 "directory_search_results_title" = "דפדף תוצאות ספרייה";
-"directory_cell_description" = "% חדרים";

 // Directory
 "directory_cell_title" = "דפדף תיקייה";
@@ -927,7 +918,6 @@
 "auth_softlogout_clear_data_message_2" = "מחק אותו שם סיימת להשתמש במכשיר זה, או אם אתה מעוניין להתחבר לחשבון אחר.";
 "auth_softlogout_clear_data_message_1" = "זהירות:המידע האישי שלך (כולל מפתחות הצפנה) עדיין שמור במכשיר זה.";
 "auth_softlogout_recover_encryption_keys" = "התחבר על מנת לשחזר את מפתחות ההצפנה השמור בצורה בלעדית במכשיר זה. תצטרך אותם על מנת לקרא את כל ההודעות המאובטחות שלך בכל מכשיר.";
-"auth_softlogout_reason" = "מנהל שרת הבית שלך (% 1 $@) הוציא אותך החוצה מהחשבון שלך % 2 $@ (% 3 $@).";
 "auth_autodiscover_invalid_response" = "תגובת חשיפה לא חוקית של שרת הבית";
 "auth_accept_policies" = "אנא עבור ואשר את המדיניות בשרת הבית הזה:";
 "auth_add_email_and_phone_warning" = "רישום באמצעות מייל ומספר טלפון יחד לא נתמך עדיין עד שה API קיים. רק מספר הטלפון יילקח בחשבון. תוכל להוסיף את כתובת המייל שלך בהגדרות הפרופיל שלך.";
@@ -1103,3 +1093,32 @@
 "settings_ui_theme" = "נושא";
 "settings_ui_language" = "שפה";
 "settings_integrations_allow_description" = "השתמש במנהל שילובים (%@) לניהול בוטים, גשרי ועידה, וו'ידגטים ומדבקות.\n\nמנהלי שילובים מקבלים נתוני תצורה, ויכולים להגדיר וו'ידגטים, לשלוח הזמנות חדרים ורמות הספק בשמך.";
+"onboarding_celebration_message" = "העדפות שלך נשמרו.";
+"onboarding_celebration_title" = "אתה מוכן!";
+"onboarding_avatar_accessibility_label" = "תמונת פרופיל";
+"onboarding_avatar_message" = "ניתן לשנות בכל זמן.";
+"onboarding_avatar_title" = "תוסיף תמונת פרופיל";
+"onboarding_display_name_max_length" = "שם התצוגה חייב להכיל פחות מ 256 תווים";
+"onboarding_display_name_hint" = "ניתן לשנות זאת מאוחר יותר";
+"onboarding_display_name_placeholder" = "שם שמופיע";
+"onboarding_display_name_message" = "זה יופיע כאשר תשלח הודעה.";
+"onboarding_display_name_title" = "בחר שם לתצוגה";
+"onboarding_personalization_skip" = "דלג על שלב זה";
+"onboarding_personalization_save" = "שמור והמשך";
+"onboarding_congratulations_home_button" = "קח אותי הביתה";
+"onboarding_congratulations_personalize_button" = "פרופיל מותאם אישית";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "חשבונך %@ נוצר.";
+"onboarding_congratulations_title" = "מזל טוב !";
+"saving" = "שומר";
+
+// Activities
+"loading" = "טוען";
+"confirm" = "מאושר";
+"edit" = "עריכה";
+"suggest" = "הצעה";
+"error" = "שגיאה";
+"add" = "הוסף";
+"existing" = "קיים";
+"new_word" = "חדש";
+"stop" = "עצור";
--- a/Riot/Assets/hu.lproj/Localizable.strings
+++ b/Riot/Assets/hu.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 /* New action message from a specific person in a named room. */
 "ACTION_FROM_USER_IN_ROOM" = "%@: * %@ %@";
 /* New action message from a specific person, not referencing a room. */
-"IMAGE_FROM_USER" = "%@ képet küldött neked %@";
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ képet küldött %@ ide: %@";
 /* A single unread message in a room */
@@ -101,7 +100,6 @@
 "AUDIO_FROM_USER" = "%@ hang fájlt küldött: %@";

 /* New video message from a specific person, not referencing a room. */
-"VIDEO_FROM_USER" = "% videót küldött";

 /** Media Messages **/

@@ -119,3 +117,6 @@

 /* New file message from a specific person, not referencing a room. */
 "LOCATION_FROM_USER" = "%@ megosztotta a földrajzi helyzetét";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ videót küldött";
--- a/Riot/Assets/hu.lproj/Vector.strings
+++ b/Riot/Assets/hu.lproj/Vector.strings
@@ -141,8 +141,8 @@
 "directory_cell_title" = "Keresés a könyvtárban";
 "directory_cell_description" = "%tu szobák";
 "directory_search_results_title" = "Találatok a könyvtár listában";
-"directory_search_results" = "%tu találat ehhez: %@";
-"directory_search_results_more_than" = ">%tu találat ehhez: %@";
+"directory_search_results" = "%1$tu találat ehhez: %2$@";
+"directory_search_results_more_than" = ">%1$tu találat ehhez: %2$@";
 "directory_searching_title" = "Könyvtár keresés…";
 "directory_search_fail" = "Az adatot nem sikerült betölteni";
 // Contacts
@@ -472,10 +472,8 @@
 "camera_access_not_granted" = "%@ -nak/nek nincs joga a kamerát használni, kérlek változtasd meg az adatvédelmi beállításokat";
 "large_badge_value_k_format" = "%.1fK";
 // room display name
-"room_displayname_invite_from" = "Meghívó innen: %@";
 "room_displayname_room_invite" = "Szoba meghívó";
 "room_displayname_two_members" = "%@ és %@";
-"room_displayname_more_than_two_members" = "%@ és %u mások";
 "room_displayname_no_title" = "Üres szoba";
 // Call
 "call_incoming_voice_prompt" = "Bejövő hanghívás innen: %@";
@@ -488,7 +486,6 @@
 "no_voip_title" = "Bejövő hívás";
 "no_voip" = "%@ hív téged de %@ egyenlőre nem támogatja a hívásokat.\nFigyelmen kívül hagyhatod ezt az értesítést és másik eszközről válaszolhatsz a hívásra vagy elutasíthatod azt.";
 // Crash report
-"google_analytics_use_prompt" = "Szeretnél segíteni személytelen összeomlás és felhasználási adatok küldésével a(z) %@ fejlesztésében?";
 // Crypto
 "e2e_enabling_on_app_update" = "%@ most már támogatja a végponttól végpontig titkosítást de újra be kell jelentkezned.\n\nMegteheted most vagy később az alkalmazás beállításainál.";
 "e2e_need_log_in_again" = "Vissza kell jelentkezned, hogy a munkamenetedhez a végponttól végpontig titkosítási kulcsokat létrehozzuk és a nyilvános kulcsokat elküldjük a Matrix szerverednek.\nEz egy egyszeri alkalom; elnézést a kellemetlenségért.";
@@ -566,7 +563,6 @@
 "settings_key_backup_info_not_valid" = "Ez a munkamenet nem menti el a kulcsaidat, de van létező mentésed ahonnan vissza  tudsz állni és továbbléphetsz.";
 "settings_key_backup_info_progress" = "%@ kulcsok mentése…";
 "settings_key_backup_info_progress_done" = "Minden kulcs elmentve";
-"settings_key_backup_info_not_trusted_from_verifiable_device_fix_action" = "A Biztonságos Üzenet Visszaállítás használatához ellenőrizd ezt: %@.";
 "settings_key_backup_info_not_trusted_fix_action" = "Ha a Biztonságos Üzenete Visszaállítást ezen az eszközön használni szeretnéd, akkor most add meg a jelmondatodat vagy a visszaállítási kulcsot.";
 "settings_key_backup_info_trust_signature_unknown" = "A mentés aláírással rendelkezik az alábbi munkamenet azonosítóval: %@";
 "settings_key_backup_info_trust_signature_valid" = "A mentés érvényes aláírással rendelkezik ettől a munkamenetről";
@@ -677,10 +673,6 @@
 "auth_autodiscover_invalid_response" = "Matrix szerver felderítésénél érvénytelen válasz érkezett";
 "room_event_action_reply" = "Válasz";
 "room_event_action_edit" = "Szerkeszt";
-"room_event_action_reaction_agree" = "Egyetért %@";
-"room_event_action_reaction_disagree" = "Ellentmond %@";
-"room_event_action_reaction_like" = "Kedveli %@";
-"room_event_action_reaction_dislike" = "Nem kedveli %@";
 "room_action_reply" = "Válasz";
 "settings_labs_message_reaction" = "Emoji reakció az üzenetre";
 "settings_key_backup_button_connect" = "Munkamenet csatlakoztatása a Kulcs Mentéshez";
@@ -826,7 +818,6 @@
 "photo_library_access_not_granted" = "A fénykép könyvár eléréséhez %@ nem rendelkezik engedéllyel, kérlek változtasd meg az adatvédelmi beállításokat";
 // Service terms
 "service_terms_modal_title" = "Felhasználási feltételek";
-"service_terms_modal_message" = "A folytatáshoz el kell fogadnod a Felhasználási feltételeket (%@).";
 "service_terms_modal_accept_button" = "Elfogad";
 "service_terms_modal_description_for_identity_server" = "Látható mások számára";
 "service_terms_modal_description_for_integration_manager" = "Használjon botokat, hidakat, kisalkalmazásokat és matrica csomagokat";
@@ -910,7 +901,6 @@
 "service_terms_modal_description_for_identity_server_2" = "Legyél megtalálható telefonszámmal vagy e-mail címmel";
 // Service terms - Variant for identity server when displayed out of a context
 "service_terms_modal_title_identity_server" = "Ismerősök keresése";
-"service_terms_modal_message_identity_server" = "Az azonosítási szerver (%@) felhasználási feltételeit el kell fogadnod, hogy ismerősöket kereshess.";
 "settings_add_3pid_password_title_email" = "E-mail cím hozzáadása";
 "settings_add_3pid_password_title_msidsn" = "Telefonszám hozzáadása";
 "settings_add_3pid_password_message" = "A folytatáshoz add meg a Matrix fiók jelszavadat";
@@ -1226,19 +1216,19 @@
 "searchable_directory_x_network" = "%@ hálózat";
 "searchable_directory_search_placeholder" = "Név vagy azon.";
 "create_room_title" = "Új szoba";
-"create_room_section_header_name" = "Szoba neve";
+"create_room_section_header_name" = "NÉV";
 "create_room_placeholder_name" = "Név";
-"create_room_section_header_topic" = "Szoba témája (nem kötelező)";
-"create_room_placeholder_topic" = "Téma";
-"create_room_section_header_encryption" = "Szoba titkosítása";
+"create_room_section_header_topic" = "TÉMA (NEM KÖTELEZŐ)";
+"create_room_placeholder_topic" = "Miről szól ez a szoba?";
+"create_room_section_header_encryption" = "TITKOSÍTÁS";
 "create_room_enable_encryption" = "Titkosítás engedélyezése";
 "create_room_section_footer_encryption" = "A titkosítást ezután nem lehet kikapcsolni.";
-"create_room_section_header_type" = "Szoba típusa";
-"create_room_type_private" = "Privát szoba";
-"create_room_type_public" = "Nyilvános szoba";
+"create_room_section_header_type" = "KI ÉRHETI EL";
+"create_room_type_private" = "Privát szoba (csak meghívóval)";
+"create_room_type_public" = "Nyilvános szoba (bárki)";
 "create_room_section_footer_type" = "Emberek csak meghívóval csatlakozhatnak a privát szobához.";
-"create_room_show_in_directory" = "A szoba megjelenítése a listában";
-"create_room_section_header_address" = "Szoba címe";
+"create_room_show_in_directory" = "Megjelenítés a szoba listába";
+"create_room_section_header_address" = "CÍM";
 "create_room_placeholder_address" = "#testroom:matrix.org";
 "room_info_list_one_member" = "1 tag";
 "room_info_list_several_members" = "%@ tag";
@@ -1755,7 +1745,6 @@
 "notice_room_aliases" = "A szoba becenevei: %@";
 "notice_room_related_groups" = "A szobához kapcsolódó csoportok: %@";
 "notice_encrypted_message" = "Titkosított üzenet";
-"notice_encryption_enabled" = "%@ bekapcsolta a végponttól végpontig titkosítást (algoritmus: %@)";
 "notice_image_attachment" = "képmelléklet";
 "notice_audio_attachment" = "hangmelléklet";
 "notice_video_attachment" = "videómelléklet";
@@ -2128,7 +2117,6 @@
 "attachment_small_with_resolution" = "Kicsi %@ (~%@)";
 "attachment_size_prompt_message" = "Ezt a beállításokban kikapcsolhatod.";
 "attachment_size_prompt_title" = "Méret megerősítése küldéshez";
-"room_displayname_all_other_participants_left" = "%@ (Bal)";
 "room_displayname_all_other_members_left" = "%@ (Bal)";
 "attachment_unsupported_preview_message" = "Ez a fájl típus nem támogatott.";
 "attachment_unsupported_preview_title" = "Az előnézetet nem lehet megjeleníteni";
@@ -2138,3 +2126,195 @@
 "room_participants_leave_processing" = "Távozás";
 "notice_error_unformattable_event" = "** Az üzenetet nem lehet megjeleníteni. Kérlek jelezd ezt a hibát";
 "settings_labs_use_only_latest_user_avatar_and_name" = "A felhasználó jelenlegi profilképének és nevének megjelenítése a régi üzeneteknél is";
+"create_room_suggest_room" = "Javaslat a tér tagság számára";
+"create_room_show_in_directory_footer" = "Ez segít az embereknek megtalálni és csatlakozni.";
+"create_room_promotion_header" = "JAVASOLT";
+"create_room_section_footer_type_public" = "Csak meghívottak találhatják meg léphetnek be és nem csak tér tagság.";
+"create_room_section_footer_type_restricted" = "Bárki a téren megtalálhatja és beléphet.";
+"create_room_section_footer_type_private" = "Csak a meghívott személyek találják meg és tudnak belépni.";
+"create_room_type_restricted" = "Tér tagság";
+"call_jitsi_unable_to_start" = "Konferencia hívás nem indítható";
+"room_suggestion_settings_screen_message" = "A javasolt szobák a tér tagság számára csatlakozásra érdemesként lesznek feltüntetve.";
+"room_suggestion_settings_screen_title" = "Szoba javasoltnak állítása a téren belül";
+
+// Room suggestion Settings
+"room_suggestion_settings_screen_nav_title" = "Szoba javaslat";
+"room_access_space_chooser_other_spaces_section" = "További terek és szobák";
+"room_access_space_chooser_known_spaces_section" = "Ismert terek amik tartalmazzák: %@";
+"room_access_settings_screen_setting_room_access" = "Szoba hozzáférés beállítások";
+"room_access_settings_screen_upgrade_alert_upgrading" = "Szoba fejlesztése";
+"room_access_settings_screen_upgrade_alert_upgrade_button" = "Fejlesztés";
+"room_access_settings_screen_upgrade_alert_auto_invite_switch" = "Tagok automatikus meghívása az új szobába";
+"room_access_settings_screen_upgrade_alert_title" = "Szoba fejlesztése";
+"room_access_settings_screen_public_message" = "Bárki megtalálhatja és beléphet.";
+"room_access_settings_screen_edit_spaces" = "Terek szerkesztése";
+"room_access_settings_screen_upgrade_required" = "Fejlesztés szükséges";
+"room_access_settings_screen_restricted_message" = "Bárki a téren megtalálhatja és beléphet.\nMeg kell adni mely terekre legyen igaz.";
+"room_access_settings_screen_private_message" = "Csak meghívott emberek láthatják és léphetnek be.";
+"room_access_settings_screen_message" = "Döntsd el ki találhatja meg és léphet be ide: %@.";
+"room_access_settings_screen_title" = "Ki tud hozzáférni a szobához?";
+
+// Room Access Settings
+"room_access_settings_screen_nav_title" = "Szoba hozzáfárés";
+"room_details_promote_room_suggest_title" = "Javaslat a tér tagság számára";
+"room_details_promote_room_title" = "Szoba ajánlása";
+"room_details_access_row_title" = "Hozzáférés";
+"settings_labs_enable_auto_report_decryption_errors" = "Titkosítás visszafejtési hibák automatikus jelentése";
+"room_preview_decline_invitation_options" = "Elutasítod a meghívót vagy a felhasználót figyelmen kívül hagyod?";
+"threads_beta_cancel" = "Nem most";
+"threads_beta_enable" = "Próbáld ki";
+"threads_beta_information_link" = "Tudj meg többet";
+"threads_beta_title" = "Üzenetszálak";
+"threads_notice_done" = "Értem";
+"threads_notice_title" = "Az üzenetszálak többé már nem kísérleti funkció! 🎉";
+"room_participants_invite_prompt_to_msg" = "Biztos, hogy meg akarod hívni őt: %@ ide: %@?";
+"onboarding_celebration_button" = "Gyerünk";
+"onboarding_celebration_message" = "A beállítások elmentve.";
+"onboarding_celebration_title" = "Minden kész!";
+"onboarding_avatar_accessibility_label" = "Profilkép";
+"onboarding_avatar_message" = "Bármikor megváltoztatható.";
+"onboarding_avatar_title" = "Profilkép hozzáadása";
+"onboarding_display_name_max_length" = "A megjelenítendő név 256 karakternél rövidebb legyen";
+"onboarding_display_name_hint" = "Ezt később meg lehet változtatni";
+"onboarding_display_name_placeholder" = "Megjelenítendő név";
+"onboarding_display_name_message" = "Ez fog megjelenni amikor üzenetet küldesz.";
+"onboarding_display_name_title" = "Válassz egy megjelenítési nevet";
+"onboarding_personalization_skip" = "Lépés kihagyása";
+"onboarding_personalization_save" = "Mentés és tovább";
+"onboarding_congratulations_home_button" = "Vigyél haza";
+"onboarding_congratulations_personalize_button" = "Profil személyre szabása";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "A fiókod elkészült: %@.";
+"onboarding_congratulations_title" = "Gratulálunk!";
+"saving" = "Mentés";
+
+// Activities
+"loading" = "Betöltés";
+"edit" = "Szerkeszt";
+"suggest" = "Javasol";
+"add" = "Hozzáad";
+"existing" = "Létező";
+"new_word" = "Új";
+"stop" = "Állj";
+"joining" = "Belépés";
+"threads_beta_information" = "Tedd a megbeszéléseket átláthatóvá üzenetszálakkal.\n\nAz üzenetszálak segítenek a beszélgetések témánál tartásában és követésében. ";
+"threads_notice_information" = "A kísérleti időszakban készült üzenetszálak ezentúl <b>közönséges válaszokként jelennek meg</b><br/><br/>Ez egy egyszeri konverzió, mivel az üzenetszálak már a Matrix részét képezik.";
+"ignore_user" = "Felhasználó figyelmen kívül hagyása";
+"location_sharing_pin_drop_share_title" = "Ennek a pozíciónak az elküldése";
+"location_sharing_static_share_title" = "Jelenlegi pozícióm elküldése";
+"live_location_sharing_banner_stop" = "Megállítás";
+"live_location_sharing_banner_title" = "Folyamatos pozíció megosztás engedélyezve";
+
+// MARK: Live location sharing
+
+"location_sharing_live_share_title" = "Pozícióm folyamatos megosztása";
+"side_menu_coach_message" = "Húzd jobbra vagy koppints hosszan minden szoba megjelenítéséhez";
+"spaces_add_room_missing_permission_message" = "Nincs jogosultságod szobát hozzáadni ehhez a térhez.";
+"spaces_creation_in_one_space" = "1 térben";
+"spaces_creation_in_many_spaces" = "%@ térben";
+"spaces_creation_in_spacename_plus_many" = "itt: %@ + %@ tér";
+"spaces_creation_in_spacename_plus_one" = "itt: %@ +1 tér";
+"spaces_creation_in_spacename" = "itt: %@";
+"spaces_creation_post_process_inviting_users" = "%@ felhasználó meghívása";
+"spaces_creation_post_process_adding_rooms" = "%@ szoba hozzáadása";
+"spaces_creation_post_process_creating_room" = "Készítés: %@";
+"spaces_creation_post_process_uploading_avatar" = "Profilkép feltöltése";
+"spaces_creation_post_process_creating_space_task" = "Készítés: %@";
+"spaces_creation_post_process_creating_space" = "Tér készítése";
+"spaces_creation_invite_by_username_message" = "Később is meg tudod hívni őket.";
+"spaces_creation_invite_by_username_title" = "Csoporttársak meghívása";
+"spaces_creation_invite_by_username" = "Meghívás felhasználónévvel";
+"spaces_creation_add_rooms_message" = "Ez a tér csak a tied, senki nem lesz értesítve. Később is hozzáadhatsz többet.";
+"spaces_creation_add_rooms_title" = "Mit szeretne hozzáadni?";
+"spaces_creation_sharing_type_me_and_teammates_detail" = "Privát tér neked és a csoporttársaidnak";
+"spaces_creation_sharing_type_me_and_teammates_title" = "Én és a csoporttársaim";
+"spaces_creation_sharing_type_just_me_detail" = "Privát tér a szobáid csoportosításához";
+"spaces_creation_sharing_type_just_me_title" = "Csak én";
+"spaces_creation_sharing_type_message" = "Ellenőrizd, hogy a megfelelő személyeknek van hozzáférése ide: %@. Később ezt megváltoztathatod.";
+"spaces_creation_sharing_type_title" = "Kivel dolgozol együtt?";
+"spaces_creation_email_invites_email_title" = "E-mail";
+"spaces_creation_email_invites_message" = "Később is meg tudod hívni őket.";
+"spaces_creation_email_invites_title" = "Csoporttársak meghívása";
+"spaces_creation_new_rooms_support" = "Támogatás";
+"spaces_creation_new_rooms_random" = "Véletlen";
+"spaces_creation_new_rooms_general" = "Általános";
+"spaces_creation_new_rooms_room_name_title" = "Szoba neve";
+"spaces_creation_new_rooms_message" = "Mindenhez készítünk egy szobát.";
+"spaces_creation_new_rooms_title" = "Milyen beszélgetések lesznek?";
+"spaces_creation_cancel_message" = "Amit eddig beállítottál elveszik.";
+"spaces_creation_cancel_title" = "Megszakítod a tér készítését?";
+"spaces_creation_private_space_title" = "Privát tér";
+"spaces_creation_public_space_title" = "Nyilvános tér";
+"spaces_creation_address_already_exists" = "%@\nmár létezik";
+"spaces_creation_address_invalid_characters" = "%@\nérvénytelen karaktert tartalmaz";
+"spaces_creation_address_default_message" = "A tered látható lesz itt:\n%@";
+"spaces_creation_empty_room_name_error" = "Név szükséges";
+"spaces_creation_address" = "Cím";
+"spaces_creation_settings_message" = "Adj hozzá pár információt, hogy tűnjön ki. Bármikor megváltoztathatod.";
+"spaces_creation_footer" = "Ezt később meg lehet változtatni";
+"spaces_creation_visibility_message" = "Létező térbe való belépéshez meghívó szükséges.";
+"spaces_creation_visibility_title" = "Milyen típusú teret szeretnél készíteni?";
+
+// Mark: - Space Creation
+
+"spaces_creation_hint" = "Szobák és emberek csoportosításának új lehetősége a Terek használata.";
+"space_settings_current_address_message" = "A tered látható itt:\n%@";
+"space_settings_update_failed_message" = "A tér beállításainak megváltoztatása nem sikerült. Megpróbálod újra?";
+"space_settings_access_section" = "Ki tud hozzáférni a térhez?";
+"space_topic" = "Leírás";
+"space_public_join_rule_detail" = "Nyílt tér mindenkinek, a legjobb a közösségeknek";
+"spaces_add_space" = "Tér hozzáadása";
+"spaces_add_room" = "Szoba hozzáadása";
+"spaces_invite_people" = "Személyek meghívása";
+"space_private_join_rule_detail" = "Csak meghívóval, saját célra és csoportoknak ideális";
+"spaces_explore_rooms_one_room" = "1 szoba";
+"spaces_explore_rooms_room_number" = "%@ szoba";
+"spaces_create_space_title" = "Tér készítése";
+"spaces_add_space_title" = "Tér készítése";
+"space_invite_not_enough_permission" = "Nincs jogosultságod embereket meghívni erre a térre";
+"room_invite_not_enough_permission" = "Nincs jogosultságod embereket meghívni ebbe a szobába";
+"room_invite_to_room_option_detail" = "Nem lesznek a részesei ennek: %@.";
+"room_invite_to_room_option_title" = "Csak ehhez a szobához";
+"room_invite_to_space_option_detail" = "Felderíthetik ezt: %@, de nem lesznek a tagsága ennek: %@.";
+
+// Mark: - Room invite
+
+"room_invite_to_space_option_title" = "Ide: %@";
+"share_invite_link_space_text" = "Szia, lépj be ebbe a térbe itt: %@";
+"share_invite_link_room_text" = "Szia, lépj be a szobába itt: %@";
+
+// MARK: - Share invite link
+
+"share_invite_link_action" = "Meghívási link megosztása";
+"create_room_processing" = "Szoba készítés";
+"create_room_suggest_room_footer" = "A javasolt szobák a tér tagság számára csatlakozásra érdemesként lesznek feltüntetve.";
+"room_access_space_chooser_other_spaces_section_info" = "Ezek valószínűleg olyanok, amelyeknek más %@ adminok is tagjai.";
+"room_displayname_more_than_two_members" = "%@ és %@ mások";
+"location_sharing_live_list_item_stop_sharing_action" = "Megosztás megállítása";
+"location_sharing_live_list_item_current_user_display_name" = "Te";
+"location_sharing_live_list_item_last_update_invalid" = "Frissítés ideje ismeretlen";
+"location_sharing_live_list_item_last_update" = "Frissítve ekkor: %@";
+"location_sharing_live_list_item_sharing_expired" = "A megosztás lejárt";
+"location_sharing_live_list_item_time_left" = "%@ elhagyta a szobát";
+"location_sharing_live_viewer_title" = "Földrajzi helyzet";
+"location_sharing_live_map_callout_title" = "Tartózkodási hely megosztása";
+"room_access_settings_screen_upgrade_alert_note" = "Vedd figyelembe, hogy a fejlesztés a szoba új verzióját hozza létre. Minden jelenlegi üzenet itt marad az archivált szobában.";
+"room_access_settings_screen_upgrade_alert_message_no_param" = "A szülő térből bárki megtalálhatja és beléphet ebbe a szobába - nem kell meghívni egyenként senkit. Ezt a beállítást bármikor megváltoztathatod a szoba beállításokban.";
+"room_access_settings_screen_upgrade_alert_message" = "Itt: %@ bárki megtalálhatja és beléphet ebbe a szobába - nem kell meghívni egyenként senkit. Ezt a beállítást bármikor megváltoztathatod a szoba beállításokban.";
+"settings_presence_offline_mode_description" = "Ha engedélyezed úgy látszol majd mások számára, mintha nem kapcsolódnál a hálózathoz még akkor is amikor az alkalmazást használod.";
+"settings_presence_offline_mode" = "Kapcsolat nélküli mód";
+"settings_presence" = "Állapot";
+"threads_discourage_information_2" = "\n\nEnnek ellenére be szeretné kapcsolni az üzenetszálakat?";
+"threads_discourage_information_1" = "A Matrix szervered jelenleg nem támogatja az üzenetszálakat így ez a funkció nem lesz megbízható. Bizonyos üzenetszálas üzenetek nem jelennek meg megbízhatóan. ";
+"location_sharing_live_stop_sharing_progress" = "Földrajzi helymeghatározás megállítása";
+"location_sharing_live_stop_sharing_error" = "A megosztás megállítása nem sikerült";
+"location_sharing_live_no_user_locations_error_title" = "Felhasználói helymeghatározás nem érhető el";
+"location_sharing_live_timer_selector_long" = "8 órán át";
+"location_sharing_live_timer_selector_medium" = "1 órán át";
+"location_sharing_live_timer_selector_short" = "15 percig";
+"location_sharing_live_timer_selector_title" = "Válaszd ki meddig láthatják mások az élő földrajzi helyzetedet.";
+"location_sharing_live_error" = "Élő pozíció megosztás hiba";
+"location_sharing_live_loading" = "Élő földrajzi helyzet meghatározás betöltése…";
+"location_sharing_live_timer_incoming" = "Élő eddig: %@";
+"live_location_sharing_ended" = "Élő pozíció megosztás befejeződött";
+"confirm" = "Megerősítés";
--- a/Riot/Assets/id.lproj/Localizable.strings
+++ b/Riot/Assets/id.lproj/Localizable.strings
@@ -65,13 +65,11 @@
 "REACTION_FROM_USER" = "%@ mereaksi %@";

 /* Look, stuff's happened, alright? Just open the app. */
-"MSGS_IN_TWO_PLUS_ROOMS" = "%@ pesan baru di %@, %@ dan %@ lainnya";

 /* Multiple messages in two rooms */
 "MSGS_IN_TWO_ROOMS" = "%@ pesan baru di %@ dan %@";

 /* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
-"MSGS_FROM_TWO_PLUS_USERS" = "%@ pesan baru dari %@, %@ dan %@ lainnya";

 /* Multiple unread messages from three people */
 "MSGS_FROM_THREE_USERS" = "%@ pesan baru dari %@, %@ dan %@";
@@ -168,3 +166,9 @@

 /* New file message from a specific person, not referencing a room. */
 "LOCATION_FROM_USER" = "%@ membagikan lokasinya";
+
+/* Look, stuff's happened, alright? Just open the app. */
+"MSGS_IN_TWO_PLUS_ROOMS" = "%@ pesan baru dalam %@, %@ dan lainnya";
+
+/* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
+"MSGS_FROM_TWO_PLUS_USERS" = "%@ pesan baru dari %@, %@ dan lainnya";
--- a/Show More
+++ b/Show More