Merge upstream/main into main

2026-05-09 14:51:17 +04:00
parent 3f9f79bdd1 f6416c79ff
commit 77d685cf89
2683 changed files with 42649 additions and 27674 deletions
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -9,10 +9,4 @@ then
  exit 1
 fi

-swift-package-list ElementX.xcodeproj --requires-license --ignore-package compound-ios --ignore-package compound-design-tokens --ignore-package matrix-rich-text-editor-swift --ignore-package element-call-swift --output-type settings-bundle --output-path ElementX/SupportingFiles
-if ! git diff --quiet -- ./ElementX/SupportingFiles/Settings.bundle || [ -n "$(git ls-files --others --exclude-standard -- ./ElementX/SupportingFiles/Settings.bundle)" ]; then
-  echo "pre-commit: Commit aborted due to unstaged changes to the package Acknowledgements."
-  exit 1
-fi
-
 ./Tools/Scripts/validate_lfs.sh
--- a/.github/workflows/accessibility-tests.yml
+++ b/.github/workflows/accessibility-tests.yml
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:

  schedule:
-    - cron:  '0 2 * * 1-5'
+    - cron: "0 2 * * 1-5"

 permissions: {}

@@ -20,7 +20,7 @@ jobs:
      cancel-in-progress: true

    steps:
-      - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
        with:
          persist-credentials: false

@@ -31,7 +31,7 @@ jobs:
        run: swift run -q tools ci accessibility-tests

      - name: Archive artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        if: failure()
        with:
          name: Results
--- a/.github/workflows/automatic-calendar-version.yml
+++ b/.github/workflows/automatic-calendar-version.yml
@@ -4,7 +4,7 @@ on:
    # At 03:00 UTC every Tuesday in preparation for an RC.
    # The tool assumes the release is published in 6-days (the following Monday).
    # Note: Most of these runs will be no-op until the release month changes.
-    - cron: '0 3 * * 2'
+    - cron: "0 3 * * 2"
  workflow_dispatch:

 permissions: {}
@@ -13,7 +13,7 @@ permissions: {}
 # Patch bumps are handled by the release script.
 jobs:
  automatic-calendar-version:
-    runs-on: macos-15
+    runs-on: macos-26
    timeout-minutes: 15

    # Skip in forks
@@ -25,17 +25,16 @@ jobs:
          persist-credentials: false

      - name: Setup environment
-        run: 
-          source ci_scripts/ci_common.sh && setup_github_actions_environment
+        run: source ci_scripts/ci_common.sh && setup_github_actions_environment

      - name: Bump the CalVer if needed
        run: swift run -q tools bump-calendar-version

      - name: Create a PR for the new version
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
        with:
          token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-          author: ElementRobot <releases@riot.im>
+          author: Element CI <ci@element.io>
          commit-message: Bump the calendar version ready for the next release
          title: Bump the calendar version ready for the next release
          body: |
--- a/.github/workflows/blocked.yml
+++ b/.github/workflows/blocked.yml
@@ -16,7 +16,7 @@ jobs:
      pull-requests: read
    steps:
      - name: Add notice
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        if: contains(github.event.pull_request.labels.*.name, 'X-Blocked')
        with:
          script: |
--- a/.github/workflows/compound-ios.yml
+++ b/.github/workflows/compound-ios.yml
@@ -7,20 +7,19 @@ on:
  workflow_dispatch:

  push:
-    branches: [ develop ]
+    branches: [develop]
    paths:
-      - 'compound-ios/**'
+      - "compound-ios/**"

  pull_request:
    types: [opened, synchronize, reopened]
    paths:
-      - 'compound-ios/**'
+      - "compound-ios/**"

 permissions: {}

 jobs:
  tests:
-
    runs-on: macos-26
    timeout-minutes: 15

@@ -31,12 +30,12 @@ jobs:
      cancel-in-progress: true

    steps:
-    - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
        with:
          persist-credentials: false

      - name: Configure Xcode 26
-      run: sudo xcode-select -s /Applications/Xcode_26.1.1.app
+        run: sudo xcode-select -s /Applications/Xcode_26.4.app

      - name: Install sourcery
        run: brew install sourcery
@@ -46,11 +45,11 @@ jobs:
        run: sourcery --config Tools/Sourcery/PreviewTestsConfig.yml

      - name: Create simulator
-      run: xcrun simctl create "Snapshots" "iPhone SE (3rd generation)" "com.apple.CoreSimulator.SimRuntime.iOS-26-1"
+        run: xcrun simctl create "Snapshots" "iPhone SE (3rd generation)" "com.apple.CoreSimulator.SimRuntime.iOS-26-4"

      - name: Run tests
        working-directory: compound-ios
-      run: set -o pipefail && xcodebuild test -scheme 'Compound' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=Snapshots,OS=26.1' -skipPackagePluginValidation -resultBundlePath Logs/CompoundTests.xcresult | xcbeautify --renderer github-actions
+        run: set -o pipefail && xcodebuild test -scheme 'Compound' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=Snapshots,OS=26.4.1' -skipPackagePluginValidation -resultBundlePath Logs/CompoundTests.xcresult | xcbeautify --renderer github-actions

      - name: Zip artifacts
        if: failure() # We only care about artefacts if the tests fail
@@ -58,7 +57,7 @@ jobs:
        run: zip -r Logs/CompoundTests.xcresult.zip Logs/CompoundTests.xcresult/

      - name: Archive artifacts
-      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        if: failure() # We only care about artefacts if the tests fail
        with:
          name: test-results
@@ -67,11 +66,10 @@ jobs:
          if-no-files-found: ignore

      - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        with:
          fail_ci_if_error: false
          token: ${{ secrets.CODECOV_TOKEN }}
          xcode: true
          xcode_archive_path: compound-ios/Logs/CompoundTests.xcresult
          flags: compound
- 
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -2,7 +2,7 @@ name: Danger CI

 on:
  pull_request:
-    types: [ labeled, synchronize, opened, reopened ]
+    types: [labeled, synchronize, opened, reopened]

 permissions: {}

--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -2,7 +2,7 @@ name: Integration tests

 on:
  schedule:
-    - cron:  '0 2 * * 1-5'
+    - cron: "0 2 * * 1-5"

  workflow_dispatch:

@@ -25,8 +25,7 @@ jobs:
          persist-credentials: false

      - name: Setup environment
-        run:
-          source ci_scripts/ci_common.sh && setup_github_actions_environment
+        run: source ci_scripts/ci_common.sh && setup_github_actions_environment

      - name: Run tests
        run: swift run -q tools ci integration-tests
@@ -36,7 +35,7 @@ jobs:
          INTEGRATION_TESTS_PASSWORD: ${{ secrets.INTEGRATION_TESTS_PASSWORD }}

      - name: Archive artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        # We only care about artefacts if the tests fail
        if: failure()
        with:
@@ -48,7 +47,7 @@ jobs:
      - name: Upload coverage to Codecov
        # Skip if not successful and in forks
        if: ${{ success() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        with:
          report_type: coverage
          files: test_output/integration-cobertura.xml
@@ -60,7 +59,7 @@ jobs:
      - name: Upload test results to Codecov
        # Skip if cancelled and in forks
        if: ${{ !cancelled() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        continue-on-error: true
        with:
          report_type: test_results
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -3,7 +3,7 @@ name: Post-release
 on:
  push:
    tags:
-      - 'release/**'
+      - "release/**"

 permissions: {}

@@ -15,7 +15,7 @@ jobs:

    steps:
      - name: Trigger pipeline
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ secrets.ENTERPRISE_ACTIONS_TOKEN }}
          script: |
--- a/.github/workflows/record-snapshots.yml
+++ b/.github/workflows/record-snapshots.yml
@@ -0,0 +1,64 @@
+name: Record Snapshots
+
+on:
+  # Triggered when a maintainer adds the "record-snapshots" label to a PR.
+  pull_request: # zizmor: ignore[dangerous-triggers]
+    types: [labeled]
+
+permissions: {}
+
+jobs:
+  record-snapshots:
+    name: Record Preview Snapshots
+    runs-on: macos-26
+    timeout-minutes: 45
+
+    if: >
+      github.event.label.name == 'record-snapshots' &&
+      github.event.pull_request.head.repo.full_name == github.repository
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    concurrency:
+      group: record-snapshots-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
+
+    steps:
+      - name: Remove label
+        if: github.event.label.name == 'record-snapshots'
+        uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 #v1.3.0
+        with:
+          labels: record-snapshots
+
+      - name: Checkout PR
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
+        with:
+          # Check out the PR head commit (not the base branch).
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: true
+
+      - name: Setup environment
+        run: source ci_scripts/ci_common.sh && setup_github_actions_environment
+
+      - name: Run preview tests in recording mode
+        run: swift run -q tools ci preview-tests --record
+
+      - name: Commit and push updated snapshots
+        run: |
+          git config user.name "Element CI"
+          git config user.email "ci@element.io"
+
+          # Stage only snapshot changes.
+          git add PreviewTests/Sources/__Snapshots__/
+
+          if git diff --cached --quiet; then
+            echo "✅ No snapshot changes detected."
+          else
+            git commit -m "Record preview snapshots"
+            git push origin HEAD:refs/heads/${GITHUB_EVENT_PULL_REQUEST_HEAD_REF}
+            echo "✅ Snapshots recorded and pushed."
+          fi
+        env:
+          GITHUB_EVENT_PULL_REQUEST_HEAD_REF: ${{ github.event.pull_request.head.ref }}
--- a/.github/workflows/renovate-xcodegen.yml
+++ b/.github/workflows/renovate-xcodegen.yml
@@ -0,0 +1,58 @@
+name: Update project following Renovate-XcodeGen update
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - project.yml
+
+permissions: {}
+
+jobs:
+  update-project:
+    name: Update Xcode project
+    runs-on: macos-26
+    timeout-minutes: 20
+    permissions:
+      contents: write
+
+    # Only run for Renovate PRs originating from this repository (not forks)
+    if: github.event.pull_request.user.login == 'renovate[bot]' && github.event.pull_request.head.repo.full_name == github.repository
+
+    concurrency:
+      group: renovate-xcodegen-${{ github.head_ref }}
+      cancel-in-progress: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          # We need to push any changes to the project.
+          persist-credentials: true
+
+      - name: Install dependencies
+        run: |
+          unset HOMEBREW_NO_INSTALL_FROM_API
+          export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+          brew install xcodegen FelixHerrmann/tap/swift-package-list
+
+      - name: Run XcodeGen
+        run: xcodegen
+
+      - name: Resolve dependencies and build the project
+        run: xcodebuild -scheme ElementX -project ElementX.xcodeproj -destination 'generic/platform=iOS Simulator' build
+
+      - name: Update Acknowledgements
+        run: swift-package-list ElementX.xcodeproj --requires-license --ignore-package compound-ios --ignore-package compound-design-tokens --ignore-package matrix-rich-text-editor-swift --ignore-package element-call-swift --output-type settings-bundle --output-path ElementX/SupportingFiles
+
+      - name: Commit and push changes
+        run: |
+          git config user.name "Element CI"
+          git config user.email "ci@element.io"
+          git add ElementX.xcodeproj/project.pbxproj
+          git add ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+          git add ElementX/SupportingFiles/Settings.bundle
+          git diff --staged --quiet || git commit -m "Run XcodeGen, update Package.resolved and Settings.bundle"
+          git push
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -1,4 +1,4 @@
-name: Close stale issues that are missing info.
+name: Close stale issues and pull requests.

 on:
  schedule:
@@ -11,13 +11,18 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      issues: write
+      pull-requests: write
    steps:
      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
        with:
          only-labels: "X-Needs-Info"
          days-before-issue-stale: 30
          days-before-issue-close: 7
-          days-before-pr-stale: -1
+          days-before-pr-stale: 30
+          days-before-pr-close: 7
+          stale-pr-label: "stale"
+          stale-pr-message: "This pull request has seen no activity for the past 30 days and will now be marked as stale. Please update it or leave a comment within the next 7 days to keep it open."
+          close-pr-message: "This pull request is being closed due to inactivity."
          stale-issue-label: "stale"
          labels-to-remove-when-unstale: "X-Needs-Info"
          stale-issue-message: "This issue has been awaiting further information for the past 30 days so will now be marked as stale. Please provide the requested information within the next 7 days to keep it open."
--- a/.github/workflows/translations-pr.yml
+++ b/.github/workflows/translations-pr.yml
@@ -2,14 +2,14 @@ name: Open Translations PR
 on:
  schedule:
    # At 03:00 on every Monday UTC
-    - cron: '0 3 * * 1'
+    - cron: "0 3 * * 1"
  workflow_dispatch:

 permissions: {}

 jobs:
  open-translations-pr:
-    runs-on: macos-15
+    runs-on: macos-26
    timeout-minutes: 15

    # Skip in forks
@@ -21,8 +21,7 @@ jobs:
          persist-credentials: false

      - name: Setup environment
-        run: 
-          source ci_scripts/ci_common.sh && setup_github_actions_translations_environment
+        run: source ci_scripts/ci_common.sh && setup_github_actions_translations_environment

      - name: Download All Translations
        run: swift run -q tools download-strings --all-languages
@@ -34,10 +33,10 @@ jobs:
        run: swift run -q tools generate-sas

      - name: Create PR for Translations
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
        with:
          token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-          author: ElementRobot <releases@riot.im>
+          author: Element CI <ci@element.io>
          commit-message: Translations update
          title: Translations update
          body: |
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -0,0 +1,30 @@
+name: Move new issues onto Issue triage board
+
+on:
+  issues:
+    types: [opened]
+
+permissions: {} # We use ELEMENT_BOT_TOKEN instead
+
+jobs:
+  add_to_triage:
+    runs-on: ubuntu-latest
+    if: >
+      github.repository == 'element-hq/element-x-ios'
+    steps:
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+        with:
+          project-url: https://github.com/orgs/element-hq/projects/81
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_element_x_issues:
+    name: ElementX issues to ElementX project board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'element-hq/element-x-ios'
+    steps:
+      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+        with:
+          project-url: https://github.com/orgs/element-hq/projects/43
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
--- a/.github/workflows/triage_incoming.yml
+++ b/.github/workflows/triage_incoming.yml
@@ -1,30 +0,0 @@
-name: Move new issues onto Issue triage board
-
-on:
-  issues:
-    types: [opened]
-
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
-jobs:
-  add_to_triage:
-    runs-on: ubuntu-latest
-    if: >
-      github.repository == 'element-hq/element-x-ios'
-    steps:
-        - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
-          with:
-              project-url: https://github.com/orgs/element-hq/projects/81
-              github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_element_x_issues:
-    name: ElementX issues to ElementX project board
-    runs-on: ubuntu-latest
-    # Skip in forks
-    if: >
-      github.repository == 'element-hq/element-x-ios'
-    steps:
-        - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
-          with:
-              project-url: https://github.com/orgs/element-hq/projects/43
-              github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -8,7 +8,7 @@ on:
        required: false

  schedule:
-    - cron:  '0 2 * * 1-5'
+    - cron: "0 2 * * 1-5"

 permissions: {}

@@ -28,7 +28,7 @@ jobs:
      cancel-in-progress: true

    steps:
-      - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
        with:
          persist-credentials: false

@@ -46,7 +46,7 @@ jobs:
          GITHUB_EVENT_INPUTS_TEST_NAME: ${{ github.event.inputs.test_name }}

      - name: Archive artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        # We only care about artefacts if the tests fail
        if: failure()
        with:
@@ -58,7 +58,7 @@ jobs:
      - name: Upload coverage to Codecov
        # Skip if not successful and in forks
        if: ${{ success() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        with:
          report_type: coverage
          files: test_output/ui-cobertura.xml
@@ -70,7 +70,7 @@ jobs:
      - name: Upload test results to Codecov
        # Skip if cancelled and in forks
        if: ${{ !cancelled() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        continue-on-error: true
        with:
          report_type: test_results
--- a/.github/workflows/unit-tests-enterprise.yml
+++ b/.github/workflows/unit-tests-enterprise.yml
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:

  push:
-    branches: [ develop ]
+    branches: [develop]

  pull_request:

@@ -25,7 +25,7 @@ jobs:
      cancel-in-progress: true

    steps:
-      - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
        with:
          submodules: recursive
          token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -41,7 +41,7 @@ jobs:
        run: swift run -q tools ci unit-tests --skip-previews

      - name: Archive artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        # We only care about artefacts if the tests fail
        if: failure()
        with:
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:

  push:
-    branches: [ develop ]
+    branches: [develop]

  pull_request:

@@ -22,7 +22,7 @@ jobs:
      cancel-in-progress: true

    steps:
-      - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
        with:
          persist-credentials: false

@@ -33,7 +33,7 @@ jobs:
        run: swift run -q tools ci unit-tests

      - name: Archive artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        # We only care about artefacts if the tests fail
        if: failure()
        with:
@@ -45,7 +45,7 @@ jobs:
      - name: Upload coverage to Codecov
        # Skip if not successful and in forks
        if: ${{ success() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        with:
          report_type: coverage
          files: test_output/unit-cobertura.xml,test_output/preview-cobertura.xml
@@ -57,7 +57,7 @@ jobs:
      - name: Upload test results to Codecov
        # Skip if cancelled and in forks
        if: ${{ !cancelled() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        continue-on-error: true
        with:
          report_type: test_results
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -21,4 +21,4 @@ jobs:
          persist-credentials: false

      - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ build

 ## Editors
 .nova
+.vscode

 ## Project specific
 test_output
--- a/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift
+++ b/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift
@@ -43,6 +43,10 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "AudioRoomTimelineView_Previews")
    }

+    func testAuthenticationClassicAppBackupInstructionsView() async throws {
+        try await performAccessibilityAudit(named: "AuthenticationClassicAppBackupInstructionsView_Previews")
+    }
+
    func testAuthenticationStartScreen() async throws {
        try await performAccessibilityAudit(named: "AuthenticationStartScreen_Previews")
    }
@@ -235,6 +239,10 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "ImageRoomTimelineView_Previews")
    }

+    func testInviteUsersConfirmationSheetView() async throws {
+        try await performAccessibilityAudit(named: "InviteUsersConfirmationSheetView_Previews")
+    }
+
    func testInviteUsersScreenSelectedItem() async throws {
        try await performAccessibilityAudit(named: "InviteUsersScreenSelectedItem_Previews")
    }
@@ -299,6 +307,14 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "LiveLocationRoomTimelineView_Previews")
    }

+    func testLiveLocationSharingBannerView() async throws {
+        try await performAccessibilityAudit(named: "LiveLocationSharingBannerView_Previews")
+    }
+
+    func testLiveLocationSheet() async throws {
+        try await performAccessibilityAudit(named: "LiveLocationSheet_Previews")
+    }
+
    func testLoadableImage() async throws {
        try await performAccessibilityAudit(named: "LoadableImage_Previews")
    }
@@ -591,6 +607,10 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "RoomSelectionScreen_Previews")
    }

+    func testRoomThreadListScreen() async throws {
+        try await performAccessibilityAudit(named: "RoomThreadListScreen_Previews")
+    }
+
    func testSFNumberedListView() async throws {
        try await performAccessibilityAudit(named: "SFNumberedListView_Previews")
    }
@@ -687,10 +707,6 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "SpaceSettingsScreen_Previews")
    }

-    func testSpacesAnnouncementSheetView() async throws {
-        try await performAccessibilityAudit(named: "SpacesAnnouncementSheetView_Previews")
-    }
-
    func testSpacesScreen() async throws {
        try await performAccessibilityAudit(named: "SpacesScreen_Previews")
    }
@@ -815,6 +831,10 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "UserIndicatorToastView_Previews")
    }

+    func testUserLocationCell() async throws {
+        try await performAccessibilityAudit(named: "UserLocationCell_Previews")
+    }
+
    func testUserProfileCell() async throws {
        try await performAccessibilityAudit(named: "UserProfileCell_Previews")
    }
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,222 @@
+## Changes in 26.05.0 (2026-05-06)
+
+### What's Changed
+
+✨ Features
+* Promote "history sharing on invite" out of developer options by @richvdh in https://github.com/element-hq/element-x-ios/pull/5480
+* Removed Live Location Sharing feature flag by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5498
+* Live Location Sharing - handle server echoes by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5514
+* Limit knock FF only room creation and access type changes by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5524
+* Add the Live location setting to the change permissions screen by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5546
+* Remove the `RoomDirectorySearch` feature flag and enable the feature by default by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5552
+
+🙌 Improvements
+* Stop showing live location disclaimer once accepted. by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5471
+* Remove support for handling SPA calls within the app. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5515
+* Update TimelineMediaPreviewDetailsView to match the latest design. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5513
+* Allow the mac app to chose room avatars directly from files instead of the photo library by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5486
+* Restore the .oidcCallback route for external authentication. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5391
+* Live Location Sharing: Show alert if user has no LLS permissions in the room. by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5542
+
+🐛 Bugfixes
+* Use CurrentValuePublisher for `[LiveLocationShare]` updates by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5466
+* LocationSharingScreen: fix indefinite loading on the center to location button in non picker mode by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5469
+* Fix a bug where the onboarding flow was dismissed by logging out. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5481
+* Live Location Sharing better error handling by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5509
+* Fixes for multi-window support. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5528
+* Avoid force-unwrap of scene.keyWindow in WindowManager.configure. by @danderson-cont in https://github.com/element-hq/element-x-ios/pull/5535
+* Move verification request acceptance confirmation to method call response instead of delegate callback by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5541
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5516
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5534
+
+🧱 Build
+* Update all UI test snapshots following 26.4 migration by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5460
+* Fix testUserFlow integration tests, at least locally by @manuroe in https://github.com/element-hq/element-x-ios/pull/5352
+* update sim version to 26.4.1 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5479
+* Split OSVersion from runtime version when creating sims on CI by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5496
+* Fix UI Tests by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5502
+* Move integration test flows that don't require a backend to the UI tests by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5507
+* Bump the calendar version ready for the next release by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5505
+* Re-enable the AppLock UI tests on iPhone only. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5530
+* Show which test suite failed in the UnitTest logs. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5531
+* Switch the xcodegen renovate schedule to fortnightly by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5543
+
+🚧 In development 🚧
+* Improve Live Location Sharing with reduced accuracy mode by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5461
+* Bold the room cell when highlighted if not showing all activity. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5468
+* Live Location Sharing: force a stop before starting a new session by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5475
+* Open Live Locations map on tapping on the banner by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5477
+* Fix a bug where calls don't ring when quiet notifications are hidden. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5484
+
+Others
+* Add a Developer Options button to the AuthenticationStartScreen on Nightly builds. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5472
+* Update SDK to 26.04.23 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5478
+* Combine DM call actions into one menu item by @amshakal in https://github.com/element-hq/element-x-ios/pull/5473
+* Update dependency PostHog to v3.54.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5482
+* Update the SDK, handling OIDC/OAuth API breaks. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5497
+* Avoid logouts when resetting the caches by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5501
+* Update sdk to 26.04.28 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5511
+* #5504 - Add logs around route handling and the global search window presentation by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5519
+* Update XcodeGen dependencies. by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5520
+* Update dependency PostHog to v3.56.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5529
+* Update dependency element-hq/compound-design-tokens to v10.1.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5526
+* Update dependency PostHog to v3.57.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5532
+* Update XcodeGen by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5539
+* Update dependency PostHog to v3.57.2 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5540
+* Rename OIDC to OAuth. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5525
+* Add an OAuthPresenterHook. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5545
+* Update SDK to 26.05.06 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5550
+
+### New Contributors
+* @danderson-cont made their first contribution in https://github.com/element-hq/element-x-ios/pull/5535
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/26.04.2...release/26.05.0
+
+## Changes in 26.04.2 (2026-04-21)
+
+### What's Changed
+
+✨ Features
+* Make media captions scrollable by @bxdxnn in https://github.com/element-hq/element-x-ios/pull/5384
+* Support for ongoing voice vs video call + joining by @BillCarsonFr in https://github.com/element-hq/element-x-ios/pull/5399
+* Enable automatic Verification when already signed in with Element Classic. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5453
+
+🙌 Improvements
+* Tweak the font/icon sizes on the Space visibility label. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5396
+* Update the icon for "Remove this device" on the Settings screen. by @americanrefugee in https://github.com/element-hq/element-x-ios/pull/5415
+* Add support for homeserver capabilities to disable the `UserDetailsEditScreen` UI. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5421
+* Replace the Cancel button with a Close button on the Space Filters screen. by @americanrefugee in https://github.com/element-hq/element-x-ios/pull/5408
+* Update InviteUsersConfirmationSheet strings  by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5448
+
+🐛 Bugfixes
+* Fix the space filters button on iPad. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5402
+* Fix session verification SAS flow not automatically starting by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5446
+* Throttle capabilities updates to once per day (or when the app is next launched). by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5454
+* Fix a potential crash caused by using old Sentry transactions. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5459
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5452
+
+🧱 Build
+* Manually update project and resolved packages following Renovate XcodeGen update by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5419
+* Update preview snapshots following iOS 26.4 workflow migration. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5431
+* Add a workflow that runs on top of Renovate XcodeGen PRs to update the project and resolved packages. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5416
+* Move the Acknowledgements generation to the post-renovate workflow. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5438
+* Add a new workflow that runs the preview tests and re-records the snapshots by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5439
+* Use macOS 26 for all workflows. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5442
+* Notification Decoration Revised by @amshakal in https://github.com/element-hq/element-x-ios/pull/5312
+* Github workflow tweaks by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5457
+
+📄 Documentation
+* Add guidelines for new features and a bit refactoring. by @mxandreas in https://github.com/element-hq/element-x-ios/pull/5436
+
+🚧 In development 🚧
+* Live Location Sharing Sheet implementation by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5420
+* Live Location Sharing Map Improvements by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5440
+* Add a feature flag for automatic back pagination. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5445
+* Live Location Sharing update filtering based on time and distance by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5449
+* Handle reduced accuracy authorization case by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5455
+
+Others
+* Update dependency WysiwygComposer to v2.41.3 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5412
+* Update dependency AsyncAlgorithms to v1.1.3 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5409
+* Update dependency LRUCache to v1.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5410
+* Update dependency SwiftState to v6.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5411
+* Update dependency AnalyticsEvents to v0.33.2 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5413
+* Update dependency Collections to v1.4.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5414
+* Update dependency DeviceKit to v5.8.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5417
+* Update dependency DSWaveformImage to v14.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5418
+* Update dependency EmbeddedElementCall to v0.19.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5423
+* Update dependency Kingfisher to v8.8.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5424
+* Update dependency MapLibre to v6.25.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5426
+* Update dependency PostHog to v3.53.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5427
+* Update dependency Sentry to v9.10.0 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5428
+* Update dependency SwiftSoup to v2.13.4 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5430
+* Remove DTCoreText/Foundation references and warning fixes by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5407
+* Switch to fatalErroring on SDK background task panics in release builds too by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5433
+* Update dependency SnapshotTesting to v1.19.2 - abandoned by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5429
+* Make the well-known version optional. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5447
+* Update the SDK. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5456
+* Update the Deactivate Account strings (and icon) to call it Delete Account. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5458
+
+### New Contributors
+* @bxdxnn made their first contribution in https://github.com/element-hq/element-x-ios/pull/5384
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/26.04.1...release/26.04.2
+
+## Changes in 26.04.1 (2026-04-16)
+
+### What's Changed
+
+✨ Features
+* Add multiple window support for mac and iPad OS by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5319
+* Floating date feature is now out of the feature flag by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5360
+* Add support for starting voice calls from a DM by @BillCarsonFr in https://github.com/element-hq/element-x-ios/pull/5305
+* Add an action to the newly introduced FloatingDateBadge that scrolls the timeline to that day. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5350
+
+🙌 Improvements
+* Improve detection of link device completion when linking a new device via QR by @hughns in https://github.com/element-hq/element-x-ios/pull/5323
+* Remove the Spaces Announcement sheet. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5376
+
+🐛 Bugfixes
+* Require video for callkit even if voice call only to workaround a bug answering calls on the lock screen by @BillCarsonFr in https://github.com/element-hq/element-x-ios/pull/5366
+* Use a VStack for invite buttons when the HStack doesn't fit. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5403
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5357
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/5373
+* Translation update by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5388
+
+🦻 Accessibility
+* Fix voice over not reading voice messages properly by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5362
+
+🧱 Build
+* Update the SDK to fix support for Xcode 26.4. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5338
+* Increase the wait time for sliding sync to retrieve the integration tests room by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5339
+* Handle PRs in the stale checks. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5347
+* Upgrade the project to use Xcode 26.4 (and the 26.4 simulator for tests). by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5375
+
+🚧 In development 🚧
+* Include the always usage location description in the info.plist by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5330
+* Introduce a room thread list (WIP) by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5299
+* Allow presenting threads from the new room thread list by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5336
+* Start send and stop functions of the LiveLocationManager by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5348
+* Implement live location sharing start and stop actions in the UI by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5349
+* Small Live Location Sharing tweaks by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5351
+* Add a view with instructions for enabling backups in Element Classic. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5359
+* Add a view to show the user's account from Element Classic. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5361
+* Live Location Sharing Banner by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5370
+* Verify Element X with an existing Element Classic account. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5374
+* Fix LiveLocationManager flaky tests by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5389
+* Implement APIs for LLS observation by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5393
+* Render LiveLocations in the map by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5394
+* Add a build flag for Verify with Classic to disable it for the next RC. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5406
+
+Others
+* Update README.md by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5332
+* Fix UI test snapshots after attachment menu and reply bubble UI changes by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5337
+* Update codecov/codecov-action action to v6 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5309
+* Update dependency element-hq/compound-design-tokens to v10 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5340
+* Update reply view border corner radii and color by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5341
+* Remove the `shouldDisambiguateDisplayNames` parameter from the `RoomEvent` and `RoomStateEvent` string builders by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5344
+* Remove now unneeded `waitForInitialItems` TimelineProvider method. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/5345
+* Update the SDK handling breaking changes. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5364
+* Update the SDK. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/5369
+* Update nschloe/action-cached-lfs-checkout action to v1.2.5 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5368
+* Update actions/github-script action to v9 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5372
+* Order localazy strings alphabetically by key by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5377
+* Update peter-evans/create-pull-request action to v8.1.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5380
+* Update sdk to 26.04.13 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5390
+* Update actions/upload-artifact action to v7.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5381
+* Update zizmorcore/zizmor-action action to v0.5.3 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/5392
+* Prompt user when inviting users with uncached identities by @kaylendog in https://github.com/element-hq/element-x-ios/pull/5331
+* Update sdk to 26.04.16 by @Velin92 in https://github.com/element-hq/element-x-ios/pull/5405
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/26.04.0...release/26.04.1
+
 ## Changes in 26.04.0 (2026-03-31)

 ### What's Changed
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,21 @@
 # Contributing to Element X iOS

-Before opening a PR please make sure that there is a well defined issue. When adding a new feature or updating the user interface, the issue **must** have input from our Product team outlining the desired solution.
-
-Please note: [element-meta](https://github.com/element-hq/element-meta) is where we centralise all product level and cross platform requests. If the change you would like to make will create a disparity between platforms then there must also be a meta-issue before contributing.
-
 Support can be found in [![Element X iOS Matrix room #element-x-ios:matrix.org](https://img.shields.io/matrix/element-x-ios:matrix.org.svg?label=%23element-x-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-ios:matrix.org).

-## Contributing code to Matrix
+## Adding a new feature or enhancement

-Please read https://github.com/element-hq/synapse/blob/master/CONTRIBUTING.md.
+To make a great product with a great user experience, all the small efforts need to go in the same direction and be aligned and consistent with each other.
+
+Before making your contribution, please consider the following:
+
+* One product can’t do everything well. Element is focusing on private end-to-end encrypted messaging and voice - this can either be for consumers (e.g. friends and family) or for professional teams and organizations. Public forums and other types of chats without E2EE remain supported but are not the primary use case in case UX compromises need to be made.
+* There are 3 platforms - iOS, [Android](https://github.com/element-hq/element-x-android) and [Web/Desktop](https://github.com/element-hq/element-web). These platforms need to have feature parity and design consistency. For some features, supporting all platforms is a must have, in some cases exceptions can be made to have it on one platform only.
+* To make sure your idea fits both from a design/solution and use case perspective, please open a new issue (or find an existing issue) in [element-meta](https://github.com/element-hq/element-meta/issues) repository describing the use case and how you plan to tackle it. Do not just describe what feature is missing, explain why the users need it with a couple of real life examples from the field.
+  * In case of an existing issue, please comment that you're planning to contribute. If you create a new issue, please specify that in the issue. In such a case we will try to review the issue ASAP and provide you with initial feedback so you can be confident if and at which conditions your contributions will be accepted.
+
+Once we know that you want to contribute and have confirmed that the new feature is overall aligned with the product direction, the designers of the core team will help you with the designs and any other type of guidance when it comes to the user experience. We will try to unblock you as quickly as we can, but it may not be instant. Having a clear understanding of the use case and the impact of the feature will help us with the prioritization and faster responses.
+
+Only once all of the above is met should you open a PR with your proposed changes.

 ## Setting up a development environment

@@ -83,6 +90,8 @@ Please read the [Android docs](https://github.com/element-hq/element-x-android/b

 Please do **not** manually edit the `Localizable.strings`, `Localizable.stringsdict` or `InfoPlist.strings` files! If your PR requires new strings to be added, add the `en` values to `Untranslated.strings`/`Untranslated.stringsdict` and one of the team will transfer them over to Localazy for you.

+Once the strings have been added to Localazy, they can be downloaded by running `swift run tools download-strings`.
+
 ### Continuous Integration

 Element X uses a suite of Swift command line tools for running actions on the CI and tries to keep the configuration confined to [Tools/Sources](Tools/Sources) alongside the project's [xcodegen](project.yml) configuration.
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "93ea9d834a0ef0106fe58ec87688a187df0e5afa58307f04906f651dfa283752",
+  "originHash" : "96195bee19a32d147f55de894ed1859cd16a9c0a020eb48059a69ac3cdfffabf",
  "pins" : [
    {
      "identity" : "compound-design-tokens",
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/compound-design-tokens",
      "state" : {
-        "revision" : "c6945b4c7948fc52c95d598ed53779b3bba03fad",
-        "version" : "9.0.0"
+        "revision" : "34b9ca65ac74394fedd6dc881673ae49214486e5",
+        "version" : "10.1.1"
      }
    },
    {
@@ -15,8 +15,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/devicekit/DeviceKit",
      "state" : {
-        "revision" : "581df61650bc457ec00373a592a84be3e7468eb1",
-        "version" : "5.7.0"
+        "revision" : "56b997e8a61707218f9af09f32b2a1d1806fd792",
+        "version" : "5.8.0"
      }
    },
    {
@@ -24,8 +24,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/dmrschmidt/DSWaveformImage",
      "state" : {
-        "revision" : "4c56578ee10128ee2b2c04c9c5aa73812de722db",
-        "version" : "14.2.2"
+        "revision" : "a7a96cf4478c6fa084e76c175bcf7f4c9a38f80a",
+        "version" : "14.3.0"
      }
    },
    {
@@ -60,8 +60,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/element-call-swift",
      "state" : {
-        "revision" : "cb17195afeaa0f848b19307e0cb2a99afa9648ca",
-        "version" : "0.17.0"
+        "revision" : "0410451a459a5def781f4171bc1f2318d0238de4",
+        "version" : "0.19.2"
      }
    },
    {
@@ -95,8 +95,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/onevcat/Kingfisher",
      "state" : {
-        "revision" : "d30a5fad881137e2267f96a8e3fc35c58999bb94",
-        "version" : "8.6.2"
+        "revision" : "c152c1915f60c51e4afa0752656993ee5b3c63db",
+        "version" : "8.8.1"
      }
    },
    {
@@ -122,8 +122,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/nicklockwood/LRUCache",
      "state" : {
-        "revision" : "0d91406ecd4d6c1c56275866f00508d9aeacc92a",
-        "version" : "1.2.0"
+        "revision" : "cb5b2bd0da83ad29c0bec762d39f41c8ad0eaf3e",
+        "version" : "1.2.1"
      }
    },
    {
@@ -131,8 +131,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution",
      "state" : {
-        "revision" : "fa12216f30833c2b4d897714f7c1ca2f5608f685",
-        "version" : "6.22.1"
+        "revision" : "40e1a0db6d055abf8a1b6e2f6127a8bb6e895cf8",
+        "version" : "6.25.1"
      }
    },
    {
@@ -140,8 +140,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/matrix-org/matrix-analytics-events",
      "state" : {
-        "revision" : "cb37ee194ba298695abf10e982ef603eee06add9",
-        "version" : "0.30.0"
+        "revision" : "03a16cc5a365b7a1390fb953017205653f81d647",
+        "version" : "0.33.2"
      }
    },
    {
@@ -149,8 +149,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/matrix-rich-text-editor-swift",
      "state" : {
-        "revision" : "5f703d05bbf39f3026cc3c0697aab753a71fd83b",
-        "version" : "2.41.0"
+        "revision" : "e63cbc50e46d5ae94f1b4013bbb3cb6e898aabb9",
+        "version" : "2.41.3"
      }
    },
    {
@@ -158,8 +158,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/matrix-rust-components-swift",
      "state" : {
-        "revision" : "46b8d14c92b46f7e14febc0320b39ff3e2483e67",
-        "version" : "26.3.31"
+        "revision" : "0d5d6018a18fb65d17dc912848b035a343a4e716",
+        "version" : "26.5.6"
      }
    },
    {
@@ -185,8 +185,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/PostHog/posthog-ios",
      "state" : {
-        "revision" : "3f80c969c17c7fa32518feb66f3eed63613639d0",
-        "version" : "3.37.1"
+        "revision" : "218fb6fe016a27baa3651613d53dae5c6e36af15",
+        "version" : "3.57.3"
      }
    },
    {
@@ -194,8 +194,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/getsentry/sentry-cocoa",
      "state" : {
-        "revision" : "de66bd4fa0661c81455e8ad2509ed6f0e39025dc",
-        "version" : "9.2.0"
+        "revision" : "a49e7c2148ac9e38bd35ef4f13bc9d6ea3ff0b81",
+        "version" : "9.11.0"
      }
    },
    {
@@ -221,17 +221,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-async-algorithms",
      "state" : {
-        "revision" : "6c050d5ef8e1aa6342528460db614e9770d7f804",
-        "version" : "1.1.1"
-      }
-    },
-    {
-      "identity" : "swift-atomics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-atomics.git",
-      "state" : {
-        "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
-        "version" : "1.3.0"
+        "revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
+        "version" : "1.1.3"
      }
    },
    {
@@ -248,8 +239,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-collections",
      "state" : {
-        "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
-        "version" : "1.3.0"
+        "revision" : "6675bc0ff86e61436e615df6fc5174e043e57924",
+        "version" : "1.4.1"
      }
    },
    {
@@ -293,8 +284,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
      "state" : {
-        "revision" : "a8b7c5e0ed33d8ab8887d1654d9b59f2cbad529b",
-        "version" : "1.18.7"
+        "revision" : "ad5e3190cc63dc288f28546f9c6827efc1e9d495",
+        "version" : "1.19.2"
      }
    },
    {
@@ -311,8 +302,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/scinfu/SwiftSoup.git",
      "state" : {
-        "revision" : "d86f244ed497d48012782e2f59c985a55e77b3f5",
-        "version" : "2.11.3"
+        "revision" : "6c7915e16f729857aec3e99068c361e58a00ed68",
+        "version" : "2.13.4"
      }
    },
    {
--- a/ElementX/Resources/Localizations/be.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/be.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict
@@ -4,26 +4,24 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Уведзеная лічба %1$d</string>
 			<key>few</key>
 			<string>Уведзена %1$d лічбы</string>
 			<key>many</key>
 			<string>Уведзена %1$d лічб</string>
+			<key>one</key>
+			<string>Уведзеная лічба %1$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -35,83 +33,83 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Прачытана %1$@ і %2$d іншым</string>
 			<key>few</key>
 			<string>Прачытана %1$@ і %2$d іншымі</string>
 			<key>many</key>
 			<string>Прачытана %1$@ і %2$d іншымі</string>
+			<key>one</key>
+			<string>Прачытана %1$@ і %2$d іншым</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d іншы</string>
 			<key>few</key>
 			<string>%d іншыя</string>
 			<key>many</key>
 			<string>%d іншых</string>
+			<key>one</key>
+			<string>%d іншы</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d удзельнік</string>
 			<key>few</key>
 			<string>%1$d удзельнікі</string>
 			<key>many</key>
 			<string>%1$d удзельнікаў</string>
+			<key>one</key>
+			<string>%1$d удзельнік</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d голас</string>
 			<key>few</key>
 			<string>%d галасы</string>
 			<key>many</key>
 			<string>%d галасоў</string>
+			<key>one</key>
+			<string>%d голас</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -123,11 +121,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -139,11 +137,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -171,47 +169,47 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d паведамленне</string>
 			<key>few</key>
 			<string>%1$@: %2$d паведамленні</string>
 			<key>many</key>
 			<string>%1$@: %2$d паведамленняў</string>
+			<key>one</key>
+			<string>%1$@: %2$d паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d апавяшчэнне</string>
 			<key>few</key>
 			<string>%d апавяшчэнні</string>
 			<key>many</key>
 			<string>%d апавяшчэнняў</string>
+			<key>one</key>
+			<string>%d апавяшчэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,83 +221,83 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d запрашэнне</string>
 			<key>few</key>
 			<string>%d запрашэнні</string>
 			<key>many</key>
 			<string>%d запрашэнняў</string>
+			<key>one</key>
+			<string>%d запрашэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d новае паведамленне</string>
 			<key>few</key>
 			<string>%d новыя паведамленні</string>
 			<key>many</key>
 			<string>%d новых паведамленняў</string>
+			<key>one</key>
+			<string>%d новае паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d непрачытанае апавяшчэнне</string>
 			<key>few</key>
 			<string>%d непрачытаныя апавяшчэнні</string>
 			<key>many</key>
 			<string>%d непрачытаных апавяшчэнняў</string>
+			<key>one</key>
+			<string>%d непрачытанае апавяшчэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d пакой</string>
 			<key>few</key>
 			<string>%d пакоі</string>
 			<key>many</key>
 			<string>%d пакояў</string>
+			<key>one</key>
+			<string>%d пакой</string>
 		</dict>
-	</dict>
-	<key>screen_app_lock_subtitle</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -307,35 +305,51 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>У вас %1$d спроба разблакіроўкі</string>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_app_lock_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>У вас %1$d спробы разблакіроўкі</string>
 			<key>many</key>
 			<string>У вас %1$d спроб разблакіроўкі</string>
+			<key>one</key>
+			<string>У вас %1$d спроба разблакіроўкі</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Няправільны PIN-код. У вас застаўся %1$d шанец</string>
 			<key>few</key>
 			<string>Няправільны PIN-код. У вас засталася %1$d шанцы</string>
 			<key>many</key>
 			<string>Няправільны PIN-код. У вас засталася %1$d шанцаў</string>
+			<key>one</key>
+			<string>Няправільны PIN-код. У вас застаўся %1$d шанец</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -347,11 +361,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -359,17 +373,33 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%1$d Замацаванае паведамленне</string>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>%1$d Замацаваныя паведамленні</string>
 			<key>many</key>
 			<string>%1$d Замацаваных паведамленняў</string>
+			<key>one</key>
+			<string>%1$d Замацаванае паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -381,29 +411,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d удзельнік</string>
 			<key>few</key>
 			<string>%1$d удзельнікі</string>
 			<key>many</key>
 			<string>%1$d удзельнікаў</string>
+			<key>one</key>
+			<string>%1$d удзельнік</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +461,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +477,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,65 +493,65 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d змена ў пакоі</string>
 			<key>few</key>
 			<string>%1$d змены ў пакоі</string>
 			<key>many</key>
 			<string>%1$d змен у пакоі</string>
+			<key>one</key>
+			<string>%1$d змена ў пакоі</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ і %3$d іншы</string>
 			<key>few</key>
 			<string></string>
 			<key>many</key>
 			<string>%1$@, %2$@ і %3$d іншыя</string>
+			<key>one</key>
+			<string>%1$@, %2$@ і %3$d іншы</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ піша</string>
 			<key>few</key>
 			<string>%1$@ пішуць</string>
 			<key>many</key>
 			<string>%1$@ пішуць</string>
+			<key>one</key>
+			<string>%1$@ піша</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -533,11 +563,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,42 +579,44 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Знайшлі %1$d пастаўшчыка push-апавяшчэнняў: %2$@</string>
 			<key>few</key>
 			<string>Знайшлі %1$d пастаўшчыкоў push-апавяшчэнняў: %2$@</string>
 			<key>many</key>
 			<string>Знайшлі %1$d пастаўшчыкоў push-апавяшчэнняў: %2$@</string>
+			<key>one</key>
+			<string>Знайшлі %1$d пастаўшчыка push-апавяшчэнняў: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d знойдзены размеркавальнік: %2$@.</string>
 			<key>few</key>
 			<string>%1$d знойдзены размеркавальнікі: %2$@.</string>
 			<key>many</key>
 			<string>%1$d знойдзена размеркавальнікаў: %2$@.</string>
+			<key>one</key>
+			<string>%1$d знойдзены размеркавальнік: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/bg.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/bg.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d въведени цифри</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Прочетено от %1$@ и %2$d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d членове</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d гласа</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d отговора</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d стаи</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d пространства</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d известия</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d покани</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d нови съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d непрочетени известени съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d стаи</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Имате %1$d опита да отключите</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Грешен PIN. Имате още %1$d шанса</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d закачени съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d души</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d промени в стаята</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ и %3$d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ пишат</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/cs.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/cs.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Chcete-li pořizovat snímky nebo videa a odesílat je jako zprávu, potřebuje Element X přístup k fotoaparátu.";
 "NSFaceIDUsageDescription" = "K přístupu do aplikace se používá Face ID.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Aby mohla aplikace Element X sdílet vaši aktuální polohu, potřebuje přístup k poloze, i když je aplikace spuštěna na pozadí.";
 "NSLocationWhenInUseUsageDescription" = "Udělte přístup k poloze, aby mohl Element X sdílet vaši polohu.";
 "NSMicrophoneUsageDescription" = "Aby bylo možné nahrávat a odesílat zprávy se zvukem, potřebuje Element X přístup k mikrofonu.";
 "NSPhotoLibraryUsageDescription" = "To vám umožní ukládat obrázky a videa do knihovny fotografií.";
--- a/ElementX/Resources/Localizations/cs.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/cs.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict
@@ -4,116 +4,114 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>zadána %1$d číslice</string>
 			<key>few</key>
 			<string>zadány %1$d číslice</string>
+			<key>one</key>
+			<string>zadána %1$d číslice</string>
 			<key>other</key>
 			<string>zadáno %1$d číslic</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d procento z celkového počtu hlasů</string>
 			<key>few</key>
 			<string>%1$d procenta z celkového počtu hlasů</string>
+			<key>one</key>
+			<string>%1$d procento z celkového počtu hlasů</string>
 			<key>other</key>
 			<string>%1$d procent z celkového počtu hlasů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Přečetl(a) %1$@ a %2$d další</string>
 			<key>few</key>
 			<string>Přečetl(a) %1$@ a %2$d další</string>
+			<key>one</key>
+			<string>Přečetl(a) %1$@ a %2$d další</string>
 			<key>other</key>
 			<string>Přečetl(a) %1$@ a %2$d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d další</string>
 			<key>few</key>
 			<string>%d další</string>
+			<key>one</key>
+			<string>%d další</string>
 			<key>other</key>
 			<string>%d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen</string>
 			<key>few</key>
 			<string>%1$d členové</string>
+			<key>one</key>
+			<string>%1$d člen</string>
 			<key>other</key>
 			<string>%1$d členů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d hlas</string>
 			<key>few</key>
 			<string>%d hlasy</string>
+			<key>one</key>
+			<string>%d hlas</string>
 			<key>other</key>
 			<string>%d hlasů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -123,492 +121,530 @@
 			<key>other</key>
 			<string>%1$d odpovědí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d místnost</string>
 			<key>few</key>
 			<string>%1$d místnosti</string>
+			<key>one</key>
+			<string>%1$d místnost</string>
 			<key>other</key>
 			<string>%1$d místností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vybraný</string>
 			<key>few</key>
 			<string>%1$d vybrané</string>
+			<key>one</key>
+			<string>%1$d vybraný</string>
 			<key>other</key>
 			<string>%1$d vybraných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prostor</string>
 			<key>few</key>
 			<string>%1$d prostory</string>
+			<key>one</key>
+			<string>%1$d prostor</string>
 			<key>other</key>
 			<string>%1$d prostorů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d zpráva</string>
 			<key>few</key>
 			<string>%1$@: %2$d zprávy</string>
+			<key>one</key>
+			<string>%1$@: %2$d zpráva</string>
 			<key>other</key>
 			<string>%1$@: %2$d zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d oznámení</string>
 			<key>few</key>
 			<string>%d oznámení</string>
+			<key>one</key>
+			<string>%d oznámení</string>
 			<key>other</key>
 			<string>%d oznámení</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %d novou zprávu.</string>
 			<key>few</key>
 			<string>Máte %d nové zprávy.</string>
+			<key>one</key>
+			<string>Máte %d novou zprávu.</string>
 			<key>other</key>
 			<string>Máte %d nových zpráv.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozvánka</string>
 			<key>few</key>
 			<string>%d pozvánky</string>
+			<key>one</key>
+			<string>%d pozvánka</string>
 			<key>other</key>
 			<string>%d pozvánek</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nová zpráva</string>
 			<key>few</key>
 			<string>%d nové zprávy</string>
+			<key>one</key>
+			<string>%d nová zpráva</string>
 			<key>other</key>
 			<string>%d nových zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nepřečtená oznámená zpráva</string>
 			<key>few</key>
 			<string>%d nepřečtené oznámené zprávy</string>
+			<key>one</key>
+			<string>%d nepřečtená oznámená zpráva</string>
 			<key>other</key>
 			<string>%d nepřečtených oznámených zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d místnost</string>
 			<key>few</key>
 			<string>%d místnosti</string>
+			<key>one</key>
+			<string>%d místnost</string>
 			<key>other</key>
 			<string>%d místností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>Každé %1$d metry</string>
+			<key>one</key>
+			<string>Každý %1$d metr</string>
+			<key>other</key>
+			<string>Každých %1$d metrů</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %1$d pokus pro odemknutí</string>
 			<key>few</key>
 			<string>Máte %1$d pokusy pro odemknutí</string>
+			<key>one</key>
+			<string>Máte %1$d pokus pro odemknutí</string>
 			<key>other</key>
 			<string>Máte %1$d pokusů pro odemknutí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Špatný PIN. Máte %1$d další pokus</string>
 			<key>few</key>
 			<string>Špatný PIN. Máte %1$d další pokusy</string>
+			<key>one</key>
+			<string>Špatný PIN. Máte %1$d další pokus</string>
 			<key>other</key>
 			<string>Špatný PIN. Máte %1$d dalších pokusů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opustit %1$d místnost a prostor</string>
 			<key>few</key>
 			<string>Opustit %1$d místnosti a prostor</string>
+			<key>one</key>
+			<string>Opustit %1$d místnost a prostor</string>
 			<key>other</key>
 			<string>Opustit %1$d místností a prostor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>%1$d osoby</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
+			<key>other</key>
+			<string>%1$d lidí</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Připnutá zpráva</string>
 			<key>few</key>
 			<string>%1$d Připnuté zprávy</string>
+			<key>one</key>
+			<string>%1$d Připnutá zpráva</string>
 			<key>other</key>
 			<string>%1$d Připnutých zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vykázán(a)</string>
 			<key>few</key>
 			<string>%1$d vykázáni</string>
+			<key>one</key>
+			<string>%1$d vykázán(a)</string>
 			<key>other</key>
 			<string>%1$d vykázáných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 			<key>other</key>
 			<string>%1$d osob</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozván(a)</string>
 			<key>few</key>
 			<string>%1$d pozváni</string>
+			<key>one</key>
+			<string>%1$d pozván(a)</string>
 			<key>other</key>
 			<string>%1$d pozvaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d další chce vstoupit do této místnosti</string>
 			<key>few</key>
 			<string>%1$@ +%2$d další chtějí vstoupit do této místnosti</string>
+			<key>one</key>
+			<string>%1$@ +%2$d další chce vstoupit do této místnosti</string>
 			<key>other</key>
 			<string>%1$@ +%2$d dalších chce vstoupit do této místnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>%1$d členové reagovali s %2$@</string>
+			<key>one</key>
+			<string>%1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>%1$d členů reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vy a %1$d člen jste reagovali s %2$@</string>
 			<key>few</key>
 			<string>Vy a %1$d členové jste reagovali s %2$@</string>
+			<key>one</key>
+			<string>Vy a %1$d člen jste reagovali s %2$@</string>
 			<key>other</key>
 			<string>Vy a %1$d členů reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d změna místnosti</string>
 			<key>few</key>
 			<string>%1$d změny místnosti</string>
+			<key>one</key>
+			<string>%1$d změna místnosti</string>
 			<key>other</key>
 			<string>%1$d změn místnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ a %3$d další</string>
 			<key>few</key>
 			<string>%1$@, %2$@ a %3$d další</string>
+			<key>one</key>
+			<string>%1$@, %2$@ a %3$d další</string>
 			<key>other</key>
 			<string>%1$@, %2$@ a %3$d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ píše</string>
 			<key>few</key>
 			<string>%1$@ píší</string>
+			<key>one</key>
+			<string>%1$@ píše</string>
 			<key>other</key>
 			<string>%1$@ píše</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odstranit %1$d místnost od %2$@</string>
 			<key>few</key>
 			<string>Odstranit %1$d místnosti od %2$@</string>
+			<key>one</key>
+			<string>Odstranit %1$d místnost od %2$@</string>
 			<key>other</key>
 			<string>Odstranit %1$d místností od %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od tohoto uživatele.</string>
 			<key>few</key>
 			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od těchto uživatelů.</string>
+			<key>one</key>
+			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od tohoto uživatele.</string>
 			<key>other</key>
 			<string>Zablokovali jste %1$d uživatelů. Nebudete dostávat oznámení od těchto uživatelů.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nalezen %1$d push poskytovatel: %2$@</string>
 			<key>few</key>
 			<string>Nalezeni %1$d push poskytovatelé: %2$@</string>
+			<key>one</key>
+			<string>Nalezen %1$d push poskytovatel: %2$@</string>
 			<key>other</key>
 			<string>Nalezeno %1$d push poskytovatelů: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nalezen %1$d distributor: %2$@.</string>
 			<key>few</key>
 			<string>Nalezeni %1$d distributoři: %2$@.</string>
+			<key>one</key>
+			<string>Nalezen %1$d distributor: %2$@.</string>
 			<key>other</key>
 			<string>Nalezeno %1$d distributorů: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/cy.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/cy.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict
--- a/ElementX/Resources/Localizations/da.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/da.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cifre indtastet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d procent af det samlede antal stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Læst af %1$@ og %2$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d Rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d valgt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d Klynger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d notifikationer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Du har %d nye beskeder.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d invitationer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d nye beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d ulæste beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,27 @@
 			<key>other</key>
 			<string>%d rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Hver %1$d meter</string>
+			<key>other</key>
+			<string>Hver %1$d meter</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +301,11 @@
 			<key>other</key>
 			<string>Du har %1$d forsøg på at låse op</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +317,11 @@
 			<key>other</key>
 			<string>Forkert PIN-kode. Du har %1$d flere chancer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,43 +333,11 @@
 			<key>other</key>
 			<string>Forlad %1$d rum og Klynger</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d Fastgjort besked</string>
-			<key>other</key>
-			<string>%1$d Fastgjorte beskeder</string>
 	</dict>
-	</dict>
-	<key>screen_room_member_list_banned_header_title</key>
+	<key>screen_live_location_sheet_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d Spærret</string>
-			<key>other</key>
-			<string>%1$d Spærret</string>
-		</dict>
-	</dict>
-	<key>screen_room_member_list_header_title</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +349,59 @@
 			<key>other</key>
 			<string>%1$d personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d Fastgjort besked</string>
+			<key>other</key>
+			<string>%1$d Fastgjorte beskeder</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_banned_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d Spærret</string>
+			<key>other</key>
+			<string>%1$d Spærret</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d personer</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d Inviteret</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +429,11 @@
 			<key>other</key>
 			<string>%1$@ + %2$d andre ønsker at deltage i dette rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer reagerede med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +461,11 @@
 			<key>other</key>
 			<string>Du og %1$d medlemmer reagerede med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +477,11 @@
 			<key>other</key>
 			<string>%1$d rumændringer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +493,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ og %3$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +509,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +525,11 @@
 			<key>other</key>
 			<string>Fjern %1$d rum fra %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +541,11 @@
 			<key>other</key>
 			<string>Du har blokeret %1$d brugere. Du vil ikke modtage meddelelser fra disse brugere.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +557,11 @@
 			<key>other</key>
 			<string>Fandt %1$d push-udbydere: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +573,8 @@
 			<key>other</key>
 			<string>%1$d distributører fundet:%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/de.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/de.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Um Bilder oder Videos aufzunehmen und als Nachricht zu versenden, benötigt Element X Zugriff auf die Kamera.";
 "NSFaceIDUsageDescription" = "Face ID wird verwendet um die App zu entsperren.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Um deinen Live-Standort zu teilen, benötigt Element X Zugriff auf deinen Standort, während die App im Hintergrund läuft.";
 "NSLocationWhenInUseUsageDescription" = "Erlaube Element X den Zugriff auf deinen Standort, um den Standort zu teilen.";
 "NSMicrophoneUsageDescription" = "Um Sprachnachrichten aufzunehmen und mit Element X zu versenden, wird der Zugriff auf das Mikrofon benötigt.";
 "NSPhotoLibraryUsageDescription" = "Damit kannst du Bilder und Videos in deiner Foto Galerie speichern.";
--- a/ElementX/Resources/Localizations/de.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/de.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d eingegebene Ziffern</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d Prozent aller Stimmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Gelesen von %1$@ und %2$d weiteren</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d weitere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Mitglieder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d Stimmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d Antworten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Chats</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d ausgewählt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d Mitteilungen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -205,15 +203,15 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>You have %d new message.</string>
+			<string>Du hast %d neue Nachricht.</string>
 			<key>other</key>
-			<string>You have %d new messages.</string>
+			<string>Du hast %d neue Nachrichten.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d Einladungen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d neue Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d ungelesene gemeldete Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d Chats</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Du hast %1$d Versuche, um zu entsperren</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Falsche PIN. Du hast %1$d weitere Versuche</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>%1$d Chats und Space verlassen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d fixierte Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d gesperrt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Personen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d eingeladen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d weitere möchten diesem Chat beitreten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d Mitglieder reagierten mit %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Du und %1$d Mitglieder reagierten mit %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d Änderungen im Chat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ und %3$d weitere Person</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ schreiben…</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d chats aus %2$@ entfernen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Du hast %1$d Nutzer gesperrt. Du wirst für diese Nutzer keine Benachrichtigungen erhalten.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>%1$d Push-Dienst gefunden: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d Verteiler gefunden: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/el.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/el.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ψηφία εισήχθησαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d τοις εκατό του συνόλου των ψήφων</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Διαβάστηκε από %1$@ και %2$d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Μέλη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ψήφοι</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d απαντήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Αίθουσες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d επιλέχθηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Χώροι</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d ειδοποιήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Έχετε %d νέα μηνύματα.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d προσκλήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d νέα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d μη αναγνωσμένα ειδοποημένα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d αίθουσες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Έχετε %1$d προσπάθειες να ξεκλειδώσετε</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Λάθος PIN. Έχεις %1$d ακόμη ευκαιρίες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Αφήστε τις αίθουσες και τους χώρους του %1$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Καρφιτσωμένα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Αποκλείστηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Άτομα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Προσκλήθηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d άλλοι θέλουν να συμμετάσχουν σε αυτή την αίθουσα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d μέλη αντέδρασαν με %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Εσύ και τα %1$d μέλη αντιδράσατε με %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d αλλαγές αίθουσας</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ και %3$d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>Οι χρήστες %1$@ πληκτρολογούν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Αφαιρούνται οι %1$d αίθουσες από %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Αποκλείσατε τους χρήστες %1$d. Δεν θα λαμβάνετε ειδοποιήσεις για αυτούς τους χρήστες.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Βρέθηκαν %1$d πάροχοι push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>Βρέθηκαν %1$d διανομείς: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Read by %1$@ and %2$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Members</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifications</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitations</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d new messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d unread notified messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>You have %1$d attempts to unlock</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Wrong PIN. You have %1$d more chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d People</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d room changes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/en.lproj/Untranslated.strings
+++ b/ElementX/Resources/Localizations/en.lproj/Untranslated.strings
@@ -1,16 +1,13 @@
-/* This file can be used to temporarily add strings to the project without needing to use Localazy. */
-/***** None of the strings in here will be available for translation *****/
-
-/* Used for testing */
-"untranslated" = "Untranslated";
-
-// MARK: - Soft logout
-
-"soft_logout_signin_title" = "Sign in";
-"soft_logout_signin_notice" = "Your homeserver (%1$s) admin has signed you out of your account %2$s (%3$s).";
-"soft_logout_signin_e2e_warning_notice" = "Sign in to recover encryption keys stored exclusively on this device. You need them to read all of your secure messages on any device.";
-"soft_logout_clear_data_title" = "Clear personal data";
+"crypto_history_sharing_confirm_invite_dialog_content" = "You currently don’t have any chats with these contacts. Confirm inviting them to this room before continuing.";
+"crypto_history_sharing_confirm_invite_dialog_title" = "Invite new contacts to this room?";
+"crypto_history_sharing_confirm_start_chat_dialog_content" = "You currently don’t have any chats with this person. Confirm inviting them before continuing.";
+"crypto_history_sharing_confirm_start_chat_dialog_title" = "Start a chat with this new contact?";
+"soft_logout_clear_data_dialog_content" = "Clear all data currently stored on this device?\nSign in again to access your account data and messages.";
+"soft_logout_clear_data_dialog_title" = "Clear data";
 "soft_logout_clear_data_notice" = "Warning: Your personal data (including encryption keys) is still stored on this device.\n\nClear it if you’re finished using this device, or want to sign in to another account.";
 "soft_logout_clear_data_submit" = "Clear all data";
-"soft_logout_clear_data_dialog_title" = "Clear data";
-"soft_logout_clear_data_dialog_content" = "Clear all data currently stored on this device?\nSign in again to access your account data and messages.";
+"soft_logout_clear_data_title" = "Clear personal data";
+"soft_logout_signin_e2e_warning_notice" = "Sign in to recover encryption keys stored exclusively on this device. You need them to read all of your secure messages on any device.";
+"soft_logout_signin_notice" = "Your homeserver (%1$s) admin has signed you out of your account %2$s (%3$s).";
+"soft_logout_signin_title" = "Sign in";
+"untranslated" = "Untranslated";
--- a/ElementX/Resources/Localizations/es.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/es.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos introducidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Leído por %1$@ y %2$d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d miembros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensajes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificaciones</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitaciones</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mensajes nuevos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensajes notificados no leídos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Tienes %1$d intentos de desbloqueo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>PIN incorrecto. Tienes %1$d oportunidades más</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d mensajes fijados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Personas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ y otros %2$d más quieren unirse a esta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d cambios en la sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ y %3$d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ están escribiendo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Se encontraron %1$d proveedores de push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/et.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/et.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d numbrit sisestatud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d protsenti kõikidest antud häältest</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Seda lugesid %1$@ ja veel %2$d kasutajat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d muud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d liiget</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d häält</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d vastust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d jututuba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d on valitud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d kogukonda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d teavitust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Sul on %d uut sõnumit.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d kutset</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d uut sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d lugemata sõnumit, millele on teavitus saadetud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d jututuba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Sul on lukustuse eemaldamiseks jäänud %1$d katset</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Vale PIN-kood. Saad proovida veel %1$d korda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Lahku %1$d-st jututoast ja kogukonnast</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d esiletõstetud sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d suhtluskeeluga kasutajat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d osalejat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d saatis kutse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ + veel %2$d kasutajat soovivad selle jututoaga liituda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d liige reageerisid: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Sina ja veel %1$d liiget reageerisid: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d jututoa muudatust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ ja veel %3$d osalejat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ kirjutavad</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Eemalda %1$d jututuba „%2$@“ kogukonnast</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Sa oled blokeerinud %1$d kasutajat. Sa ei saa tema kohta teavitusi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Leidsime %1$d tõuketeenuse pakkujat: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>Leidus %1$d tõuketeenuse levitajat: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/eu.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/eu.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@(e)k eta beste %2$d(e)k irakurri dute</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>beste %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d kide</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d boto</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mezu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d jakinarazpen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d gonbidapen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mezu berri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>Irakurri gabeko %d mezuren jakinarazpena</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d gela</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>%1$d saiakera dituzu desblokeatzeko</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Pin okerra. %1$d aukera gehiago dituzu.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>Finkatutako %1$d mezu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d pertsona</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ + beste %2$d gelara batu nahi dute</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d gela aldaketa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@, eta beste %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ idazten ari dira</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>%1$d push hornitzaile aurkitu dira: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d banatzailea aurkitu dira: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/fa.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/fa.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d رقم وارد شده</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>خوانده شده توسط%1$@ و%2$d نفر دیگر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d عضو</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d رأی</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@:%2$d پیام‌</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%dاعلان‌</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d دعوت</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d پیام جدید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d پیام اعلان نشده</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d اتاق</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>شما %1$d تلاش برای باز کردن قفل دارید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>پین اشتباه است. شما %1$d شانس دیگر دارید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d نفر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$dتغییر اتاق</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/fi.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/fi.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Ottaakseen kuvia tai videoita ja lähettääkseen ne viestinä, Element X tarvitsee luvan kameraan.";
 "NSFaceIDUsageDescription" = "Face ID:tä käytetään sovelluksesi avaamiseen.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Jotta voit jakaa reaaliaikaisen sijaintisi, Element X tarvitsee luvan sijaintiisi, kun sovellus on taustalla.";
 "NSLocationWhenInUseUsageDescription" = "Myönnä lupa sijaintiisi, jotta Element X voi jakaa sen.";
 "NSMicrophoneUsageDescription" = "Ääniviestien tallentamiseen ja lähettämiseen Element X:n on päästävä käsiksi mikrofoniin.";
 "NSPhotoLibraryUsageDescription" = "Tämän avulla voit tallentaa kuvia ja videoita valokuvakirjastoosi.";
--- a/ElementX/Resources/Localizations/fi.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/fi.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d numeroa syötetty</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d prosenttia kaikista äänistä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@ ja %2$d muuta on lukenut viestin</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d muuta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Jäsentä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ääntä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d vastausta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Huonetta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d valittu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Tilaa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d ilmoitusta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Sinulla on %d uutta viestiä.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d kutsua</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d uutta viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d lukematonta viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d huoneessa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Sinulla on %1$d yritystä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Väärä PIN-koodi. Sinulla on %1$d yritystä jäljellä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,43 +335,11 @@
 			<key>other</key>
 			<string>Poistu %1$d huoneesta ja tilasta</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d kiinnitetty viesti</string>
-			<key>other</key>
-			<string>%1$d kiinnitettyä viestiä</string>
 	</dict>
-	</dict>
-	<key>screen_room_member_list_banned_header_title</key>
+	<key>screen_live_location_sheet_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d porttikielletty</string>
-			<key>other</key>
-			<string>%1$d porttikiellettyä</string>
-		</dict>
-	</dict>
-	<key>screen_room_member_list_header_title</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +351,59 @@
 			<key>other</key>
 			<string>%1$d henkilöä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d kiinnitetty viesti</string>
+			<key>other</key>
+			<string>%1$d kiinnitettyä viestiä</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_banned_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d porttikielletty</string>
+			<key>other</key>
+			<string>%1$d porttikiellettyä</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d henkilö</string>
+			<key>other</key>
+			<string>%1$d henkilöä</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d kutsuttua</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d muuta haluavat liittyä tähän huoneeseen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d jäsentä reagoivat %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Sinä ja %1$d jäsentä reagoitte %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d muutosta huoneeseen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ ja %3$d muuta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ kirjoittavat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Poista %1$d huonetta tilasta %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Estit %1$d käyttäjää. Et saa ilmoituksia näiltä käyttäjiltä.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Löytyi %1$d push-palveluntarjoajaa: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d jakelijaa löytyi: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/fr.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/fr.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Afin de prendre des photos et d'enregistrer des vidéos pour les envoyer, Element X a besoin d’utiliser la caméra.";
 "NSFaceIDUsageDescription" = "Face ID est utilisé pour accéder à l’application.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Pour partager votre position en direct, Element X a besoin d'accéder à votre position même lorsque l'application fonctionne en arrière-plan.";
 "NSLocationWhenInUseUsageDescription" = "Autoriser l’accès à votre position afin de la partager avec Element X.";
 "NSMicrophoneUsageDescription" = "Afin d’enregistrer et d’envoyer des messages vocaux, Element X a besoin d’utiliser le microphone.";
 "NSPhotoLibraryUsageDescription" = "Cela vous permet d'enregistrer des images et des vidéos dans les photos de votre appareil.";
--- a/ElementX/Resources/Localizations/fr.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/fr.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d chiffres saisis</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d pour cent du total des votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lu par %1$@ et %2$d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Membres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d réponses</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Salons</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d éléments sélectionnés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Espaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@ : %2$d messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifications</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Vous avez %d nouveaux messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitations</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nouveaux messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d messages notifiés non lus</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d salons</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d mètre</string>
+			<key>other</key>
+			<string>%1$d mètres</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Il reste %1$d tentatives pour déverrouiller</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Code PIN incorrect. Il reste %1$d tentatives</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Quitter %1$d salons et l'espace</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d personne</string>
+			<key>other</key>
+			<string>%1$d personnes</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d messages épinglés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banni(e)s</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Personnes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invité(e)s</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ et %2$d autres personnes souhaitent rejoindre ce salon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d membres ont réagi avec %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Vous et %1$d membres avez réagi avec %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d changements dans le salon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ et %3$d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ écrivent</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Retirer %1$d salons de %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Vous avez bloqué %1$d utilisateurs. Vous ne recevrez pas de notifications pour ces utilisateurs.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>%1$d fournisseurs de Push détectés : %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributeurs détectés :%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/hr.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/hr.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Element X treba pristup kameri kako biste mogli fotografirati i snimati videozapise te ih slati kao poruke.";
 "NSFaceIDUsageDescription" = "Face ID se koristi za pristup vašoj aplikaciji.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Za dijeljenje vaše lokacije uživo, Element X treba pristup lokaciji kada je aplikacija u pozadini.";
 "NSLocationWhenInUseUsageDescription" = "Omogućite pristup lokaciji kako bi Element X mogao dijeliti vašu lokaciju.";
 "NSMicrophoneUsageDescription" = "Element X treba pristup mikrofonu kako biste mogli snimati i slati poruke sa zvukom.";
 "NSPhotoLibraryUsageDescription" = "To vam omogućuje spremanje slika i videozapisa u fotogaleriju.";
--- a/ElementX/Resources/Localizations/hr.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/hr.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict
@@ -4,609 +4,651 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d unesena znamenka</string>
 			<key>few</key>
 			<string>%1$d unesene znamenke</string>
+			<key>one</key>
+			<string>%1$d unesena znamenka</string>
 			<key>other</key>
 			<string>%1$d unesenih znamenaka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d posto ukupnog broja glasova</string>
 			<key>few</key>
 			<string>%1$d posto ukupnog broja glasova</string>
+			<key>one</key>
+			<string>%1$d posto ukupnog broja glasova</string>
 			<key>other</key>
 			<string>%1$d posto ukupnog broja glasova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pročitao %1$@ i ostalih %2$d</string>
 			<key>few</key>
 			<string>Pročitala %1$@ i ostala %2$d</string>
+			<key>one</key>
+			<string>Pročitao %1$@ i ostalih %2$d</string>
 			<key>other</key>
 			<string>Pročitalo %1$@ i ostalih %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>još %d</string>
 			<key>few</key>
 			<string>još %d</string>
+			<key>one</key>
+			<string>još %d</string>
 			<key>other</key>
 			<string>još %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d član</string>
 			<key>few</key>
 			<string>%1$d člana</string>
+			<key>one</key>
+			<string>%1$d član</string>
 			<key>other</key>
 			<string>%1$d članova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d glas</string>
 			<key>few</key>
 			<string>%d glasa</string>
+			<key>one</key>
+			<string>%d glas</string>
 			<key>other</key>
 			<string>%d glasova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odgovor</string>
 			<key>few</key>
 			<string>%1$d odgovora</string>
+			<key>one</key>
+			<string>%1$d odgovor</string>
 			<key>other</key>
 			<string>%1$d odgovora</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d soba</string>
 			<key>few</key>
 			<string>%1$d sobe</string>
+			<key>one</key>
+			<string>%1$d soba</string>
 			<key>other</key>
 			<string>%1$d soba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>few</key>
+			<string></string>
 			<key>one</key>
-			<string>%1$d selected</string>
+			<string>%1$d odabrano</string>
 			<key>other</key>
-			<string>%1$d selected</string>
+			<string>%1$d odabrano</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prostor</string>
 			<key>few</key>
 			<string>%1$d prostora</string>
+			<key>one</key>
+			<string>%1$d prostor</string>
 			<key>other</key>
 			<string>%1$d prostora</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d poruka</string>
 			<key>few</key>
 			<string>%1$@: %2$d poruke</string>
+			<key>one</key>
+			<string>%1$@: %2$d poruka</string>
 			<key>other</key>
 			<string>%1$@: %2$d poruka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d obavijest</string>
 			<key>few</key>
 			<string>%d obavijesti</string>
+			<key>one</key>
+			<string>%d obavijest</string>
 			<key>other</key>
 			<string>%d obavijesti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>few</key>
+			<string></string>
 			<key>one</key>
-			<string>You have %d new message.</string>
+			<string>Imate%d novu poruku.</string>
 			<key>other</key>
-			<string>You have %d new messages.</string>
+			<string>Imate %d novi poruka.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozivnica</string>
 			<key>few</key>
 			<string>%d pozivnice</string>
+			<key>one</key>
+			<string>%d pozivnica</string>
 			<key>other</key>
 			<string>%d pozivnica</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nova poruka</string>
 			<key>few</key>
 			<string>%d nove poruke</string>
+			<key>one</key>
+			<string>%d nova poruka</string>
 			<key>other</key>
 			<string>%d novih poruka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nepročitana poruka s obavijesti</string>
 			<key>few</key>
 			<string>%d nepročitane poruke s obavijesti</string>
+			<key>one</key>
+			<string>%d nepročitana poruka s obavijesti</string>
 			<key>other</key>
 			<string>%d nepročitanih poruka s obavijesti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d soba</string>
 			<key>few</key>
 			<string>%d sobe</string>
+			<key>one</key>
+			<string>%d soba</string>
 			<key>other</key>
 			<string>%d soba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>Svaki %1$d metar</string>
+			<key>one</key>
+			<string>Svaki %1$d metar</string>
+			<key>other</key>
+			<string>Svaki %1$d metara</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Imate %1$d pokušaj otključavanja</string>
 			<key>few</key>
 			<string>Imate %1$d pokušaja otključavanja</string>
+			<key>one</key>
+			<string>Imate %1$d pokušaj otključavanja</string>
 			<key>other</key>
 			<string>Imate %1$d pokušaja otključavanja</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pogrešan PIN. Imate još %1$d pokušaj</string>
 			<key>few</key>
 			<string>Pogrešan PIN. Imate još %1$d pokušaja</string>
+			<key>one</key>
+			<string>Pogrešan PIN. Imate još %1$d pokušaj</string>
 			<key>other</key>
 			<string>Pogrešan PIN. Imate još %1$d pokušaja</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Napusti %1$d sobu i prostor</string>
 			<key>few</key>
 			<string>Napusti %1$d sobe i prostor</string>
+			<key>one</key>
+			<string>Napusti %1$d sobu i prostor</string>
 			<key>other</key>
 			<string>Napusti %1$d soba i prostor</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prikvačena poruka</string>
 			<key>few</key>
-			<string>%1$d prikvačene poruke</string>
-			<key>other</key>
-			<string>%1$d prikvačenih poruka</string>
-		</dict>
-	</dict>
-	<key>screen_room_member_list_banned_header_title</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d zabranjen</string>
-			<key>few</key>
-			<string>%1$d zabranjena</string>
-			<key>other</key>
-			<string>%1$d zabranjenih</string>
-		</dict>
-	</dict>
-	<key>screen_room_member_list_header_title</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
+			<string>%1$d osoba</string>
 			<key>one</key>
 			<string>%1$d osoba</string>
-			<key>few</key>
-			<string>%1$d osobe</string>
 			<key>other</key>
 			<string>%1$d ljudi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>%1$d prikvačene poruke</string>
+			<key>one</key>
+			<string>%1$d prikvačena poruka</string>
+			<key>other</key>
+			<string>%1$d prikvačenih poruka</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_banned_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>%1$d zabranjena</string>
+			<key>one</key>
+			<string>%1$d zabranjen</string>
+			<key>other</key>
+			<string>%1$d zabranjenih</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>%1$d osobe</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
+			<key>other</key>
+			<string>%1$d ljudi</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozvan</string>
 			<key>few</key>
 			<string>%1$d pozvana</string>
+			<key>one</key>
+			<string>%1$d pozvan</string>
 			<key>other</key>
 			<string>%1$d pozvanih</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 			<key>few</key>
 			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
+			<key>one</key>
+			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 			<key>other</key>
 			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d član reagirao je s %2$@</string>
 			<key>few</key>
 			<string>%1$d člana reagirala su s %2$@</string>
+			<key>one</key>
+			<string>%1$d član reagirao je s %2$@</string>
 			<key>other</key>
 			<string>%1$d članova reagiralo je s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vi i %1$d član reagirali ste s %2$@</string>
 			<key>few</key>
 			<string>Vi i %1$d člana reagirali ste s %2$@</string>
+			<key>one</key>
+			<string>Vi i %1$d član reagirali ste s %2$@</string>
 			<key>other</key>
 			<string>Vi i %1$d članova reagirali ste s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d promjena sobe</string>
 			<key>few</key>
 			<string>%1$d promjene sobe</string>
+			<key>one</key>
+			<string>%1$d promjena sobe</string>
 			<key>other</key>
 			<string>%1$d promjena sobe</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ i ostalih %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ i ostalih %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ i ostalih %3$d</string>
 			<key>other</key>
 			<string>%1$@, %2$@ i ostalih %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ tipka</string>
 			<key>few</key>
 			<string>%1$@ tipka</string>
+			<key>one</key>
+			<string>%1$@ tipka</string>
 			<key>other</key>
 			<string>%1$@ tipka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>few</key>
+			<string></string>
 			<key>one</key>
-			<string>Remove %1$d room from %2$@</string>
+			<string>Uklonite %1$d soba od %2$@</string>
 			<key>other</key>
-			<string>Remove %1$d rooms from %2$@</string>
+			<string>Uklonite %1$d sobe od %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za ovog korisnika.</string>
 			<key>few</key>
 			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike.</string>
+			<key>one</key>
+			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za ovog korisnika.</string>
 			<key>other</key>
 			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pronađen je %1$d pružatelj push obavijesti: %2$@</string>
 			<key>few</key>
 			<string>Pronađena su %1$d pružatelja push obavijesti: %2$@</string>
+			<key>one</key>
+			<string>Pronađen je %1$d pružatelj push obavijesti: %2$@</string>
 			<key>other</key>
 			<string>Pronađeno je %1$d pružatelja push obavijesti: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pronađen je %1$d distributer: %2$@.</string>
 			<key>few</key>
 			<string>Pronađena su %1$d distributera: %2$@.</string>
+			<key>one</key>
+			<string>Pronađen je %1$d distributer: %2$@.</string>
 			<key>other</key>
 			<string>Pronađeno je %1$d distributera: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/hu.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/hu.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "A képek vagy videók készítéséhez és üzenetként való elküldéséhez az Element X számára hozzáférést kell biztosítania a kamerához.";
 "NSFaceIDUsageDescription" = "A Face ID segítségével elérheti az alkalmazást.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Az élő tartózkodási hely megosztásához az Element X alkalmazásnak a háttérben futva is hozzáférésre van szüksége a helyadatokhoz.";
 "NSLocationWhenInUseUsageDescription" = "Engedélyezze a tartózkodási helyhez való hozzáférést, hogy az Element X megoszthassa a tartózkodási helyét.";
 "NSMicrophoneUsageDescription" = "A hangüzenetek készítéséhez és elküldéséhez az Element X számára hozzáférést kell biztosítania a mikrofonhoz.";
 "NSPhotoLibraryUsageDescription" = "Lehetővé teszi a fényképek és videók fényképtárba mentését.";
--- a/ElementX/Resources/Localizations/hu.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/hu.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d megadott számjegy</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>az összes szavazat %1$d százaléka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Olvasta: %1$@ és még %2$d felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d további felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d tag</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d szavazat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d válasz</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d szoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d kiválasztva</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d tér</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d értesítés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Van %d új üzenete.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d meghívó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d új üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d olvasatlan értesített üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,27 @@
 			<key>other</key>
 			<string>%d szoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Minden %1$d méter</string>
+			<key>other</key>
+			<string>Minden %1$d méter</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +301,11 @@
 			<key>other</key>
 			<string>%1$d próbálkozása van a feloldáshoz</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +317,11 @@
 			<key>other</key>
 			<string>Hibás PIN-kód. Még %1$d próbálkozási lehetősége maradt.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,11 +333,27 @@
 			<key>other</key>
 			<string>%1$d szoba és tér elhagyása</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d személy</string>
+			<key>other</key>
+			<string>%1$d személy</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d kitűzött üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d kitiltva</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +397,11 @@
 			<key>other</key>
 			<string>%1$d személy</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d meghívott</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +429,11 @@
 			<key>other</key>
 			<string>%1$@ és még %2$d felhasználó szeretne csatlakozni ehhez a szobához</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d tag reagált így: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +461,11 @@
 			<key>other</key>
 			<string>Ön és %1$d tag reagáltak így: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +477,11 @@
 			<key>other</key>
 			<string>%1$d szobaváltozás</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +493,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ és %3$d további felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +509,11 @@
 			<key>other</key>
 			<string>%1$@ éppen ír…</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +525,11 @@
 			<key>other</key>
 			<string>%1$d szoba eltávolítása innen: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +541,11 @@
 			<key>other</key>
 			<string>Letiltott %1$d felhasználót. Nem fog értesítéseket kapni ezekről a felhasználókról.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +557,11 @@
 			<key>other</key>
 			<string>%1$d leküldéses értesítési szolgáltató találva: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +573,8 @@
 			<key>other</key>
 			<string>%1$d forgalmazó található: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/id.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/id.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>%1$d digit dimasukkan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>%1$d persen dari total suara</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>Dibaca oleh %1$@ dan %2$d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>%d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d Anggota</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d suara</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d balasan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -115,11 +113,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -131,11 +129,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -147,11 +145,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d pesan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%d pemberitahuan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -205,11 +203,11 @@
 			<key>other</key>
 			<string>%d undangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -219,11 +217,11 @@
 			<key>other</key>
 			<string>%d pesan baru</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -233,11 +231,11 @@
 			<key>other</key>
 			<string>%d pesan pemberitahuan yang belum dibaca</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -247,11 +245,27 @@
 			<key>other</key>
 			<string>%d ruangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -261,11 +275,11 @@
 			<key>other</key>
 			<string>Anda memiliki %1$d percobaan lagi untuk membuka kunci</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -275,11 +289,11 @@
 			<key>other</key>
 			<string>PIN salah. Anda memiliki %1$d percobaan lagi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -291,11 +305,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Pesan yang disematkan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d orang</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +395,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d lainnya ingin bergabung ke ruangan ini</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +409,11 @@
 			<key>other</key>
 			<string>%1$d anggota bereaksi dengan %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +423,11 @@
 			<key>other</key>
 			<string>Anda dan %1$d anggota bereaksi dengan %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +437,11 @@
 			<key>other</key>
 			<string>%1$d perubahan ruangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +451,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@, dan %3$d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +465,11 @@
 			<key>other</key>
 			<string>%1$@ sedang mengetik</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -451,11 +481,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -467,11 +497,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>Ditemukan %1$d penyedia notifikasi dorongan: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,6 +525,8 @@
 			<key>other</key>
 			<string>%1$d distributor ditemukan: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/it.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/it.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "Per catturare foto o video e inviarli come messaggio, Element X deve accedere alla fotocamera.";
 "NSFaceIDUsageDescription" = "Face ID viene utilizzato per accedere alla tua app.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Per condividere la tua posizione in tempo reale, Element X necessita dell'accesso alla posizione quando l'app è in background.";
 "NSLocationWhenInUseUsageDescription" = "Concedi l'accesso alla localizzazione in modo che Element X possa condividere la tua posizione.";
 "NSMicrophoneUsageDescription" = "Per registrare e inviare messaggi audio, Element X deve accedere al microfono.";
 "NSPhotoLibraryUsageDescription" = "Consente di salvare foto e video nella tua libreria.";
--- a/ElementX/Resources/Localizations/it.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/it.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cifre inserite</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percento dei voti totali</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Visualizzato da %1$@ e altri %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>altri %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Membri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d voti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d risposte</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Stanze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -141,15 +139,15 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%1$d selected</string>
+			<string>%1$d selezionato</string>
 			<key>other</key>
-			<string>%1$d selected</string>
+			<string>%1$d selezionati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spazi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d messaggi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifiche</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -205,15 +203,15 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>You have %d new message.</string>
+			<string>Hai %d nuovo messaggio.</string>
 			<key>other</key>
-			<string>You have %d new messages.</string>
+			<string>Hai %d nuovi messaggi.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d inviti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nuovi messaggi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d messaggi notificati non letti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d stanze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Hai %1$d tentativi di sblocco</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>PIN sbagliato. Hai altri %1$d tentativi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Lascia %1$d stanze e spazi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Messaggi fissati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Bannati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Persone</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invitati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d vogliono entrare in questa stanza</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d membri hanno reagito con %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Tu e %1$d altri membri avete reagito con %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d modifiche alla stanza</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e altri %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ stanno scrivendo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -493,15 +523,15 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>Remove %1$d room from %2$@</string>
+			<string>Rimuovi %1$d stanza da %2$@</string>
 			<key>other</key>
-			<string>Remove %1$d rooms from %2$@</string>
+			<string>Rimuovi %1$d stanze da %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Hai bloccato%1$d utenti. Non riceverai notifiche da questi utenti.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Provider %1$d push trovati: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributori trovati: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/ja.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/ja.lproj/InfoPlist.strings
@@ -0,0 +1,6 @@
+"NSCameraUsageDescription" = "Element X 上で写真や動画を撮影して送信するには、カメラへのアクセス権限が必要です。";
+"NSFaceIDUsageDescription" = "アプリのアクセスにFace IDを使用します。";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "ライブ位置情報を共有するには、Element X にバックグランドでの位置情報へのアクセスを許可してください。";
+"NSLocationWhenInUseUsageDescription" = "Element X が現在地を共有できるよう、位置情報へのアクセスを許可してください。";
+"NSMicrophoneUsageDescription" = "音声メッセージを録音し、送信するためには、Element X がマイクへのアクセスを許可されている必要があります。";
+"NSPhotoLibraryUsageDescription" = "端末のライブラリに画像と動画を保存することができるようになります。";
--- a/ElementX/Resources/Localizations/ja.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/ja.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>a11y_digits_entered</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 桁入力済</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>a11y_polls_percent_of_total</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>総投票数うち%1$d%</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>a11y_read_receipts_multiple_with_others</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>既読: %1$@ ほか %2$d 人</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_many_members</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>他 %d 人</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_member_count</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人のメンバー</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_poll_votes_count</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d 票</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_replies</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 件の返信</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_rooms</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のルーム</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_selected_count</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個を選択</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>common_spaces</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のスペース</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_compat_summary_line_for_room</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$@: %2$d件のメッセージ</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_compat_summary_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d 件の通知</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_fallback_n_content</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>新着のメッセージが%d 件あります。</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_invitations</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d 件の招待</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_new_messages_for_room</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d 件の新着メッセージ</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_unread_notified_messages</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d件の未読メッセージ</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>notification_unread_notified_messages_in_room_rooms</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%d 個のルーム</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$dm ごと</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_app_lock_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 回試すことができます</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_app_lock_subtitle_wrong_pin</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>PINが間違っています。あと %1$d 回試すことができます。</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_leave_space_submit</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のルームとスペースを退出</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のピン留めされたメッセージ</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_banned_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人の追放</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_member_list_pending_header_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 件の招待</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_multiple_knock_requests_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$@ 他 %2$d 人がルーム参加を希望</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_timeline_reaction_a11y</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人の反応 %2$@</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_timeline_reaction_including_you_a11y</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>あなたと %1$d 人の反応 %2$@</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_timeline_state_changes</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のルーム更新点</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_typing_many_members</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$@, %2$@ 他 %3$d 人</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_room_typing_notification</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$@ が入力中</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_space_remove_rooms_confirmation_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%2$@ から%1$d 個のルームを削除</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 人のユーザーをブロックしました。以降の通知を受信しません。</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個の通知プロバイダーを発見: %2$@</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>troubleshoot_notifications_test_unified_push_success</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>%1$d 個のディストリビューターを発見: %2$@</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+</dict>
+</plist>
--- a/ElementX/Resources/Localizations/ja.lproj/SAS.strings
+++ b/ElementX/Resources/Localizations/ja.lproj/SAS.strings
@@ -0,0 +1,64 @@
+"aeroplane" = "飛行機";
+"anchor" = "いかり";
+"apple" = "リンゴ";
+"ball" = "ボール";
+"banana" = "バナナ";
+"bell" = "ベル";
+"bicycle" = "自転車";
+"book" = "本";
+"butterfly" = "ちょうちょ";
+"cactus" = "サボテン";
+"cake" = "ケーキ";
+"cat" = "猫";
+"clock" = "時計";
+"cloud" = "雲";
+"corn" = "とうもろこし";
+"dog" = "犬";
+"elephant" = "ゾウ";
+"fire" = "炎";
+"fish" = "魚";
+"flag" = "旗";
+"flower" = "花";
+"folder" = "フォルダー";
+"gift" = "ギフト";
+"glasses" = "めがね";
+"globe" = "地球";
+"guitar" = "ギター";
+"hammer" = "金槌";
+"hat" = "帽子";
+"headphones" = "ヘッドホン";
+"heart" = "ハート";
+"horse" = "馬";
+"hourglass" = "砂時計";
+"key" = "鍵";
+"light_bulb" = "電球";
+"lion" = "ライオン";
+"lock" = "錠前";
+"moon" = "月";
+"mushroom" = "きのこ";
+"octopus" = "たこ";
+"panda" = "パンダ";
+"paperclip" = "クリップ";
+"pencil" = "鉛筆";
+"penguin" = "ペンギン";
+"pig" = "ブタ";
+"pin" = "ピン";
+"pizza" = "ピザ";
+"rabbit" = "うさぎ";
+"robot" = "ロボット";
+"rocket" = "ロケット";
+"rooster" = "ニワトリ";
+"santa" = "サンタ";
+"scissors" = "はさみ";
+"smiley" = "スマイル";
+"spanner" = "スパナ";
+"strawberry" = "いちご";
+"telephone" = "電話機";
+"thumbs_up" = "いいね";
+"train" = "電車";
+"tree" = "木";
+"trophy" = "トロフィー";
+"trumpet" = "トランペット";
+"turtle" = "亀";
+"umbrella" = "傘";
+"unicorn" = "ユニコーン";
--- a/ElementX/Resources/Localizations/ka.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/ka.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ციფრი ჩაიწერა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>წაკითხულია %1$@ და %2$d-ს ადამიანის მიერ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d სხვა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d წევრები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ხმა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d მოწვევები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d ახალი მესიჯი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d წაუკითხავი შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d ოთახი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>თქვენ გაქვთ %1$d მცდელობა განსაბლოკად</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>არასწორი PIN. თქვენ %1$d შანსი დაგრჩათ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d ადამიანი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$dოთახის ცვლილებები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@%2$@და %3$d სხვა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ წერენ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>მოიძებნა %1$d push პროვაიდერი: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d დისტრიბუტორი მოიძებნა: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/ko.lproj/InfoPlist.strings
+++ b/ElementX/Resources/Localizations/ko.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 "NSCameraUsageDescription" = "사진이나 동영상을 촬영하여 메시지로 보내려면 Element X가 카메라에 액세스할 수 있어야 합니다.";
 "NSFaceIDUsageDescription" = "Face ID를 사용하여 앱에 액세스합니다.";
-"NSLocationAlwaysAndWhenInUseUsageDescription" = "To share your live location, Element X  needs location access when the app is in the background.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "실시간 위치를 공유하려면 Element X가 백그라운드에서 위치에 액세스할 수 있어야 합니다.";
 "NSLocationWhenInUseUsageDescription" = "Element X가 귀하의 위치를 공유할 수 있도록 위치 액세스를 허용하세요.";
 "NSMicrophoneUsageDescription" = "오디오가 포함된 메시지를 녹음하고 전송하기 위해 Element X는 마이크에 액세스해야 합니다.";
 "NSPhotoLibraryUsageDescription" = "이 기능은 사진 라이브러리에 이미지 및 동영상을 저장할 수 있도록 합니다.";
--- a/ElementX/Resources/Localizations/ko.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/ko.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>%1$d자리 입력됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>%1$d 총 투표율</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>읽은 사람 %1$@ 그리고 %2$d 다른 사람들</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>%d 기타</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d 회원</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d 에 투표</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d 답변</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d 방</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d개 선택됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -141,11 +139,11 @@
 			<key>other</key>
 			<string>%1$d 스페이스</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d 메세지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -169,11 +167,11 @@
 			<key>other</key>
 			<string>%d 알림</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -183,11 +181,11 @@
 			<key>other</key>
 			<string>%d개의 새 메시지가 있습니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -197,11 +195,11 @@
 			<key>other</key>
 			<string>%d 초대</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d 새 메시지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d 읽지 않은 메시지 알림</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,27 @@
 			<key>other</key>
 			<string>%d 방</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -253,11 +267,11 @@
 			<key>other</key>
 			<string>당신은 %1$d 회 잠금 해제 시도를 가지고 있습니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -267,11 +281,11 @@
 			<key>other</key>
 			<string>PIN이 잘못되었습니다. %1$d 번 남았습니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -281,11 +295,27 @@
 			<key>other</key>
 			<string>방 %1$d개 및 스페이스 나가기</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -295,11 +325,11 @@
 			<key>other</key>
 			<string>%1$d 고정된 메시지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -309,11 +339,11 @@
 			<key>other</key>
 			<string>%1$d명 차단됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -323,11 +353,11 @@
 			<key>other</key>
 			<string>%1$d 사람</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d명 초대됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +381,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d 명이 이 방에 참여하고 싶어합니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +395,11 @@
 			<key>other</key>
 			<string>%1$d 회원들이 반응했습니다: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +409,11 @@
 			<key>other</key>
 			<string>당신과 %1$d 멤버들은 다음과 같이 반응했습니다 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +423,11 @@
 			<key>other</key>
 			<string>%1$d 방 변경</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +437,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ 및 %3$d 기타</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +451,11 @@
 			<key>other</key>
 			<string>%1$@ 입력 중입니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +465,11 @@
 			<key>other</key>
 			<string>%2$@에서 방 %1$d개 제거</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d명의 사용자를 차단했습니다. 이제 해당 사용자들의 알림을 받지 않습니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +493,11 @@
 			<key>other</key>
 			<string>%1$d 푸시 제공자를 찾았습니다: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -477,6 +507,8 @@
 			<key>other</key>
 			<string>%1$d 배포자 목록: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/lt.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/lt.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Read by %1$@ and %2$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,47 +63,47 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d narys</string>
 			<key>few</key>
 			<string>%1$d nariai</string>
+			<key>one</key>
+			<string>%1$d narys</string>
 			<key>other</key>
 			<string>%1$d narių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d balsas</string>
 			<key>few</key>
 			<string>%d balsai</string>
+			<key>one</key>
+			<string>%d balsas</string>
 			<key>other</key>
 			<string>%d balsų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -117,11 +115,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -133,11 +131,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -149,11 +147,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -165,47 +163,47 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d žinutė</string>
 			<key>few</key>
 			<string>%1$@: %2$d žinutės</string>
+			<key>one</key>
+			<string>%1$@: %2$d žinutė</string>
 			<key>other</key>
 			<string>%1$@: %2$d žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pranešimas</string>
 			<key>few</key>
 			<string>%d pranešimai</string>
+			<key>one</key>
+			<string>%d pranešimas</string>
 			<key>other</key>
 			<string>%d pranešimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -217,65 +215,83 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d kvietimas</string>
 			<key>few</key>
 			<string>%d kvietimai</string>
+			<key>one</key>
+			<string>%d kvietimas</string>
 			<key>other</key>
 			<string>%d kvietimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nauja žinutė</string>
 			<key>few</key>
 			<string>%d naujos žinutės</string>
+			<key>one</key>
+			<string>%d nauja žinutė</string>
 			<key>other</key>
 			<string>%d naujų žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d neperskaityta žinutė</string>
 			<key>few</key>
 			<string>%d neperskaitytos žinutės</string>
+			<key>one</key>
+			<string>%d neperskaityta žinutė</string>
 			<key>other</key>
 			<string>%d neperskaitytų žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>%d kambariuose</string>
+			<key>one</key>
+			<string>%d kambaryje</string>
+			<key>other</key>
+			<string>%d kambarių</string>
+		</dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -283,17 +299,15 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d kambaryje</string>
-			<key>few</key>
-			<string>%d kambariuose</string>
+			<string>Every %1$d meter</string>
 			<key>other</key>
-			<string>%d kambarių</string>
+			<string>Every %1$d meters</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>You have %1$d attempts to unlock</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,11 @@
 			<key>other</key>
 			<string>Wrong PIN. You have %1$d more chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +351,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,29 +399,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d asmuo</string>
 			<key>few</key>
 			<string>%1$d asmenys</string>
+			<key>one</key>
+			<string>%1$d asmuo</string>
 			<key>other</key>
 			<string>%1$d asmenų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -403,11 +433,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -419,11 +449,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +465,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -451,29 +481,29 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d kambario pakeitimas</string>
 			<key>few</key>
 			<string>%1$d kambario pakeitimai</string>
+			<key>one</key>
+			<string>%1$d kambario pakeitimas</string>
 			<key>other</key>
 			<string>%1$d kambario pakeitimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -485,11 +515,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -501,11 +531,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -517,11 +547,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -533,11 +563,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,11 +579,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -565,6 +595,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/nb.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/nb.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d sifre angitt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d prosent av totalt antall stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lest av %1$@ og %2$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d Rom</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d valgt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d Områder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d varsler</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Du har %d nye meldinger.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d invitasjoner</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d nye meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d uleste varslede meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,27 @@
 			<key>other</key>
 			<string>%d rom</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +301,11 @@
 			<key>other</key>
 			<string>Du har %1$d forsøk på å låse opp</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +317,11 @@
 			<key>other</key>
 			<string>Feil PIN-kode. Du har %1$d forsøk igjen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,11 +333,27 @@
 			<key>other</key>
 			<string>Forlat %1$d rom og område</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d Festede meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d utestengt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +397,11 @@
 			<key>other</key>
 			<string>%1$d personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d invitert</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +429,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d andre ønsker å bli med i dette rommet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer reagerte med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +461,11 @@
 			<key>other</key>
 			<string>Du og %1$d medlemmer reagerte med%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +477,11 @@
 			<key>other</key>
 			<string>%1$d romendringer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +493,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ og %3$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +509,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +525,11 @@
 			<key>other</key>
 			<string>Fjern %1$d rommene fra %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +541,11 @@
 			<key>other</key>
 			<string>Du blokkerte%1$d brukere. Du vil ikke motta varsler for disse brukerne.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +557,11 @@
 			<key>other</key>
 			<string>Fant %1$d push-leverandører: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +573,8 @@
 			<key>other</key>
 			<string>%1$d distributører funnet: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/nl.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/nl.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cijfers ingevoerd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Gelezen door %1$@ en %2$d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d leden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d antwoorden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d meldingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d uitnodigingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nieuwe berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d ongelezen berichten met melding</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d kamers</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Je hebt %1$d pogingen om te ontgrendelen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Verkeerde pincode. Je hebt nog %1$d kansen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Vastgezette berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d personen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d kamerveranderingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ en %3$d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ zijn aan het typen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>%1$d push-providers gevonden: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d verdelers gevonden: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/pl.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/pl.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Wprowadzono %1$d cyfrę</string>
 			<key>few</key>
 			<string>Wprowadzono %1$d cyfry</string>
 			<key>many</key>
 			<string>Wprowadzono %1$d cyfr</string>
+			<key>one</key>
+			<string>Wprowadzono %1$d cyfrę</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d procent wszystkich głosów</string>
 			<key>few</key>
 			<string>%1$d procenty wszystkich głosów</string>
 			<key>many</key>
 			<string>%1$d procent wszystkich głosów</string>
+			<key>one</key>
+			<string>%1$d procent wszystkich głosów</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odczytano przez %1$@ i %2$d inną</string>
 			<key>few</key>
 			<string>Odczytano przez %1$@ i %2$d innych</string>
 			<key>many</key>
 			<string>Odczytano przez %1$@ i %2$d innych</string>
+			<key>one</key>
+			<string>Odczytano przez %1$@ i %2$d inną</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d inny</string>
 			<key>few</key>
 			<string>%d innych</string>
 			<key>many</key>
 			<string>%d innych</string>
+			<key>one</key>
+			<string>%d inny</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d członek</string>
 			<key>few</key>
 			<string>%1$d członków</string>
 			<key>many</key>
 			<string>%1$d członków</string>
+			<key>one</key>
+			<string>%1$d członek</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d głos</string>
 			<key>few</key>
 			<string>%d głosy</string>
 			<key>many</key>
 			<string>%d głosów</string>
+			<key>one</key>
+			<string>%d głos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odpowiedź</string>
 			<key>few</key>
 			<string>%1$d odpowiedzi</string>
 			<key>many</key>
 			<string>%1$d odpowiedzi</string>
+			<key>one</key>
+			<string>%1$d odpowiedź</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Pokój</string>
 			<key>few</key>
 			<string>%1$d Pokoje</string>
 			<key>many</key>
 			<string>%1$d Pokoi</string>
+			<key>one</key>
+			<string>%1$d Pokój</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,65 +159,65 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Przestrzeń</string>
 			<key>few</key>
 			<string>%1$d Przestrzenie</string>
 			<key>many</key>
 			<string>%1$d Przestrzeni</string>
+			<key>one</key>
+			<string>%1$d Przestrzeń</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d wiadomość</string>
 			<key>few</key>
 			<string>%1$@: %2$d wiadomości</string>
 			<key>many</key>
 			<string>%1$@: %2$d wiadomości</string>
+			<key>one</key>
+			<string>%1$@: %2$d wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d powiadomienie</string>
 			<key>few</key>
 			<string>%d powiadomienia</string>
 			<key>many</key>
 			<string>%d powiadomień</string>
+			<key>one</key>
+			<string>%d powiadomienie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -231,83 +229,83 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d zaproszenie</string>
 			<key>few</key>
 			<string>%d zaproszenia</string>
 			<key>many</key>
 			<string>%d zaproszeń</string>
+			<key>one</key>
+			<string>%d zaproszenie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nowa wiadomość</string>
 			<key>few</key>
 			<string>%d nowe wiadomości</string>
 			<key>many</key>
 			<string>%d nowych wiadomości</string>
+			<key>one</key>
+			<string>%d nowa wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nieprzeczytana wiadomość</string>
 			<key>few</key>
 			<string>%d nieprzeczytane wiadomość</string>
 			<key>many</key>
 			<string>%d nieprzeczytanych wiadomości</string>
+			<key>one</key>
+			<string>%d nieprzeczytana wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pokój</string>
 			<key>few</key>
 			<string>%d pokoje</string>
 			<key>many</key>
 			<string>%d pokoi</string>
+			<key>one</key>
+			<string>%d pokój</string>
 		</dict>
-	</dict>
-	<key>screen_app_lock_subtitle</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -315,53 +313,69 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>Masz %1$d próbę, żeby odblokować</string>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_app_lock_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>Masz %1$d próby, żeby odblokować</string>
 			<key>many</key>
 			<string>Masz %1$d prób, żeby odblokować</string>
+			<key>one</key>
+			<string>Masz %1$d próbę, żeby odblokować</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Błędny PIN. Pozostała %1$d próba</string>
 			<key>few</key>
 			<string>Błędny PIN. Pozostały %1$d próby</string>
 			<key>many</key>
 			<string>Błędny PIN. Pozostało %1$d prób</string>
+			<key>one</key>
+			<string>Błędny PIN. Pozostała %1$d próba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opuść %1$d pokój i przestrzeń</string>
 			<key>few</key>
 			<string>Opuść %1$d pokoje i przestrzeń</string>
 			<key>many</key>
 			<string>Opuść %1$d pokojów i przestrzeń</string>
+			<key>one</key>
+			<string>Opuść %1$d pokój i przestrzeń</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,17 +383,33 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%1$d przypięta wiadomość</string>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>%1$d przypięte wiadomości</string>
 			<key>many</key>
 			<string>%1$d przypiętych wiadomości</string>
+			<key>one</key>
+			<string>%1$d przypięta wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -391,29 +421,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
 			<key>many</key>
 			<string>%1$d osób</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -425,119 +455,119 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d inny chce dołączyć do pokoju</string>
 			<key>few</key>
 			<string>%1$@ +%2$d innych chce dołączyć do pokoju</string>
 			<key>many</key>
 			<string>%1$@ +%2$d innych chce dołączyć do pokoju</string>
+			<key>one</key>
+			<string>%1$@ +%2$d inny chce dołączyć do pokoju</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d członek zareagował z %2$@</string>
 			<key>few</key>
 			<string>%1$d członków zareagowało z %2$@</string>
 			<key>many</key>
 			<string>%1$d członków zareagowało z %2$@</string>
+			<key>one</key>
+			<string>%1$d członek zareagował z %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ty i %1$d członek zareagowaliście z %2$@</string>
 			<key>few</key>
 			<string>Ty i %1$d członków zareagowaliście z %2$@</string>
 			<key>many</key>
 			<string>Ty i %1$d członków zareagowaliście z %2$@</string>
+			<key>one</key>
+			<string>Ty i %1$d członek zareagowaliście z %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zmiana pokoju</string>
 			<key>few</key>
 			<string>%1$d zmiany pokoju</string>
 			<key>many</key>
 			<string>%1$d zmian pokoju</string>
+			<key>one</key>
+			<string>%1$d zmiana pokoju</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ i %3$d inny</string>
 			<key>few</key>
 			<string>%1$@, %2$@ i %3$d innych</string>
 			<key>many</key>
 			<string>%1$@, %2$@ i %3$d innych</string>
+			<key>one</key>
+			<string>%1$@, %2$@ i %3$d inny</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ pisze</string>
 			<key>few</key>
 			<string>%1$@ piszą</string>
 			<key>many</key>
 			<string>%1$@ piszą</string>
+			<key>one</key>
+			<string>%1$@ pisze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,60 +579,62 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokowano %1$d użytkownika. Nie otrzymasz od niego żadnych powiadomień.</string>
 			<key>few</key>
 			<string>Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień.</string>
 			<key>many</key>
 			<string>Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień.</string>
+			<key>one</key>
+			<string>Zablokowano %1$d użytkownika. Nie otrzymasz od niego żadnych powiadomień.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Znaleziono %1$d dostawcę push: %2$@</string>
 			<key>few</key>
 			<string>Znaleziono %1$d dostawców push: %2$@</string>
 			<key>many</key>
 			<string>Znaleziono %1$d dostawców push: %2$@</string>
+			<key>one</key>
+			<string>Znaleziono %1$d dostawcę push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Znaleziono %1$d dystrybutora: %2$@.</string>
 			<key>few</key>
 			<string>Znaleziono %1$d dystrybutorów: %2$@.</string>
 			<key>many</key>
 			<string>Znaleziono %1$d dystrybutorów: %2$@.</string>
+			<key>one</key>
+			<string>Znaleziono %1$d dystrybutora: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos digitados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d por cento de todos os votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lido por %1$@ e outros %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d membros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d respostas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selecionados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d espaços</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificações</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d convites</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d novas mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensagens notificadas não lidas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Você tem %1$d tentativas de desbloqueio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>PIN incorreto. Você tem mais %1$d chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Sair de %1$d salas e do espaço</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d mensagens fixadas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d banidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d pessoas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d convidados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ + outros %2$d desejam entrar nesta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Você e mais %1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d alterações na sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e %3$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ estão digitando</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remover %1$d salas de %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Você bloqueou %1$d usuários. Você não receberá notificações deles.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Foram encontrados %1$d provedores de push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/pt.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/pt.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos inseridos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d porcento de todos os votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lida por %1$@ e %2$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d participantes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d respostas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d espaços</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificações</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d convites</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mensagens novas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensagens notificadas não lidas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Tens %1$d tentativas de desbloqueio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>PIN incorreto. Tens mais %1$d tentativas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Sair do espaço e de %1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Mensagens afixadas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d banidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d pessoas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d convidados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d outros querem entrar nesta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Tu e %1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d alterações à sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e %3$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ estão a escrever</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>Bloqueaste %1$d utilizadores. Não receberás notificações deles.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>%1$d fornecedores de envio encontrados: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/ro.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/ro.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d cifră introdusă</string>
 			<key>few</key>
 			<string>%1$d cifre introduse</string>
+			<key>one</key>
+			<string>%1$d cifră introdusă</string>
 			<key>other</key>
 			<string>%1$d cifre introduse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d la suta din totalul voturilor</string>
 			<key>few</key>
 			<string>%1$d la suta din totalul voturilor</string>
+			<key>one</key>
+			<string>%1$d la suta din totalul voturilor</string>
 			<key>other</key>
 			<string>%1$d la suta din totalul voturilor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Citit de %1$@ și incă %2$d</string>
 			<key>few</key>
 			<string>Citit de %1$@ și incă %2$d</string>
+			<key>one</key>
+			<string>Citit de %1$@ și incă %2$d</string>
 			<key>other</key>
 			<string>Citit de %1$@ și incă %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d altul</string>
 			<key>few</key>
 			<string>%d alții</string>
+			<key>one</key>
+			<string>%d altul</string>
 			<key>other</key>
 			<string>%d alții</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Membru</string>
 			<key>few</key>
 			<string>%1$d Membri</string>
+			<key>one</key>
+			<string>%1$d Membru</string>
 			<key>other</key>
 			<string>%1$d Membri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d vot</string>
 			<key>few</key>
 			<string>%d voturi</string>
+			<key>one</key>
+			<string>%d vot</string>
 			<key>other</key>
 			<string>%d voturi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d răspuns</string>
 			<key>few</key>
 			<string>%1$d răspunsuri</string>
+			<key>one</key>
+			<string>%1$d răspuns</string>
 			<key>other</key>
 			<string>%1$d răspunsuri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Camera</string>
 			<key>few</key>
 			<string>%1$d Camere</string>
+			<key>one</key>
+			<string>%1$d Camera</string>
 			<key>other</key>
 			<string>%1$d Camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,29 +159,29 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Spațiu</string>
 			<key>few</key>
 			<string>%1$d Spații</string>
+			<key>one</key>
+			<string>%1$d Spațiu</string>
 			<key>other</key>
 			<string>%1$d Spații</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -195,11 +193,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mesaje</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d notificări</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -227,11 +225,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -243,11 +241,11 @@
 			<key>other</key>
 			<string>%d invitații</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -259,11 +257,11 @@
 			<key>other</key>
 			<string>%d mesaje noi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -275,11 +273,11 @@
 			<key>other</key>
 			<string>%d mesaje notificate necitite</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -291,47 +289,81 @@
 			<key>other</key>
 			<string>%d camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Aveți %1$d încercare de deblocare</string>
 			<key>few</key>
 			<string>Aveți %1$d încercări de deblocare</string>
+			<key>one</key>
+			<string>Aveți %1$d încercare de deblocare</string>
 			<key>other</key>
 			<string>Aveți %1$d încercări de deblocare</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>PIN greșit. Mai aveți %1$d sansa</string>
 			<key>few</key>
 			<string>PIN greșit. Mai aveți %1$d sanse</string>
+			<key>one</key>
+			<string>PIN greșit. Mai aveți %1$d sansa</string>
 			<key>other</key>
 			<string>PIN greșit. Mai aveți %1$d sanse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>few</key>
+			<string>Părăsiți %1$d camere și spațiul</string>
+			<key>one</key>
+			<string>Părăsiți %1$d cameră și spațiul</string>
+			<key>other</key>
+			<string>Părăsiți %1$d camere și spațiul</string>
+		</dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -339,197 +371,195 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>Părăsiți %1$d cameră și spațiul</string>
-			<key>few</key>
-			<string>Părăsiți %1$d camere și spațiul</string>
+			<string>%1$d person</string>
 			<key>other</key>
-			<string>Părăsiți %1$d camere și spațiul</string>
+			<string>%1$d people</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Mesaj fixat</string>
 			<key>few</key>
 			<string>%1$d Mesaje fixate</string>
+			<key>one</key>
+			<string>%1$d Mesaj fixat</string>
 			<key>other</key>
 			<string>%1$d Mesaje fixate</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Interzis</string>
 			<key>few</key>
 			<string>%1$d Interziși</string>
+			<key>one</key>
+			<string>%1$d Interzis</string>
 			<key>other</key>
 			<string>%1$d Interziși</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d persoană</string>
 			<key>few</key>
 			<string>%1$d persoane</string>
+			<key>one</key>
+			<string>%1$d persoană</string>
 			<key>other</key>
 			<string>%1$d persoane</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Invitat</string>
 			<key>few</key>
 			<string>%1$d Invitați</string>
+			<key>one</key>
+			<string>%1$d Invitat</string>
 			<key>other</key>
 			<string>%1$d Invitați</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d utilizator doresc să se alăture acestei camere</string>
 			<key>few</key>
 			<string>%1$@ +%2$d utilizatori doresc să se alăture acestei camere</string>
+			<key>one</key>
+			<string>%1$@ +%2$d utilizator doresc să se alăture acestei camere</string>
 			<key>other</key>
 			<string>%1$@ +%2$d utilizatori doresc să se alăture acestei camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d membru a reacționat cu %2$@</string>
 			<key>few</key>
 			<string>%1$d membri au reacționat cu %2$@</string>
+			<key>one</key>
+			<string>%1$d membru a reacționat cu %2$@</string>
 			<key>other</key>
 			<string>%1$d membri au reacționat cu %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Dumneavoastră si %1$d membru ați reacționat cu %2$@</string>
 			<key>few</key>
 			<string>Dumneavoastră si %1$d membri ați reacționat cu %2$@</string>
+			<key>one</key>
+			<string>Dumneavoastră si %1$d membru ați reacționat cu %2$@</string>
 			<key>other</key>
 			<string>Dumneavoastră si %1$d membri ați reacționat cu %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d schimbare a camerii</string>
 			<key>few</key>
 			<string>%1$d schimbări ale camerei</string>
+			<key>one</key>
+			<string>%1$d schimbare a camerii</string>
 			<key>other</key>
 			<string>%1$d schimbări ale camerei</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ și încă %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ și încă %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ și încă %3$d</string>
 			<key>other</key>
 			<string>%1$@, %2$@ și încă %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ tastează</string>
 			<key>few</key>
 			<string>%1$@ tastează</string>
+			<key>one</key>
+			<string>%1$@ tastează</string>
 			<key>other</key>
 			<string>%1$@ tastează</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -541,60 +571,62 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ai blocat%1$d utilizator. Nu veți primi notificări pentru acest utilizator.</string>
 			<key>few</key>
 			<string>Ai blocat%1$d utilizatori. Nu veți primi notificări pentru acești utilizatori.</string>
+			<key>one</key>
+			<string>Ai blocat%1$d utilizator. Nu veți primi notificări pentru acest utilizator.</string>
 			<key>other</key>
 			<string>Ai blocat%1$d utilizatori. Nu veți primi notificări pentru acești utilizatori.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>S-a găsit %1$d furnizor push: %2$@</string>
 			<key>few</key>
 			<string>S-au găsit %1$d furnizori push: %2$@</string>
+			<key>one</key>
+			<string>S-a găsit %1$d furnizor push: %2$@</string>
 			<key>other</key>
 			<string>S-au găsit %1$d furnizori push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d distribuitor găsit: %2$@.</string>
 			<key>few</key>
 			<string>%1$d distribuitori găsiți: %2$@.</string>
+			<key>one</key>
+			<string>%1$d distribuitor găsit: %2$@.</string>
 			<key>other</key>
 			<string>%1$d distribuitori găsiți: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/ru.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/ru.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict
@@ -4,314 +4,312 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Введена %1$d цифра</string>
 			<key>few</key>
 			<string>Введено %1$d цифры</string>
 			<key>many</key>
 			<string>Введено %1$d цифр</string>
+			<key>one</key>
+			<string>Введена %1$d цифра</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d процент от общего числа голосов</string>
 			<key>few</key>
 			<string>%1$d процента от общего числа голосов</string>
 			<key>many</key>
 			<string>%1$d процентов от общего числа голосов</string>
+			<key>one</key>
+			<string>%1$d процент от общего числа голосов</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Прочитано %1$@ и %2$d другим</string>
 			<key>few</key>
 			<string>Прочитано %1$@ и %2$d другими</string>
 			<key>many</key>
 			<string>Прочитано %1$@ и %2$d другими</string>
+			<key>one</key>
+			<string>Прочитано %1$@ и %2$d другим</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d</string>
 			<key>few</key>
 			<string>%d другие</string>
 			<key>many</key>
 			<string>%d другие</string>
+			<key>one</key>
+			<string>%d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d участник</string>
 			<key>few</key>
 			<string>%1$d участников</string>
 			<key>many</key>
 			<string>%1$d участников</string>
+			<key>one</key>
+			<string>%1$d участник</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d голос</string>
 			<key>few</key>
 			<string>%d голоса</string>
 			<key>many</key>
 			<string>%d голосов</string>
+			<key>one</key>
+			<string>%d голос</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d ответ</string>
 			<key>few</key>
 			<string>%1$d ответа</string>
 			<key>many</key>
 			<string>%1$d ответов</string>
+			<key>one</key>
+			<string>%1$d ответ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Комната</string>
 			<key>few</key>
 			<string>%1$d Комнат</string>
 			<key>many</key>
 			<string>%1$d Комнат</string>
+			<key>one</key>
+			<string>%1$d Комната</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d выбран</string>
 			<key>few</key>
 			<string>%1$d выбрано</string>
 			<key>many</key>
 			<string>%1$d выбрано</string>
+			<key>one</key>
+			<string>%1$d выбран</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d пространство</string>
 			<key>few</key>
 			<string>%1$d пространства</string>
 			<key>many</key>
 			<string>%1$d пространств</string>
+			<key>one</key>
+			<string>%1$d пространство</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d сообщение</string>
 			<key>few</key>
 			<string>%1$@: %2$d сообщения</string>
 			<key>many</key>
 			<string>%1$@: %2$d сообщений</string>
+			<key>one</key>
+			<string>%1$@: %2$d сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d уведомление</string>
 			<key>few</key>
 			<string>%d уведомления</string>
 			<key>many</key>
 			<string>%d уведомлений</string>
+			<key>one</key>
+			<string>%d уведомление</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>У Вас %d новое сообщение.</string>
 			<key>few</key>
 			<string>У Вас %d новых сообщения.</string>
 			<key>many</key>
 			<string>У Вас %d новых сообщений.</string>
+			<key>one</key>
+			<string>У Вас %d новое сообщение.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d приглашение</string>
 			<key>few</key>
 			<string>%d приглашения</string>
 			<key>many</key>
 			<string>%d приглашений</string>
+			<key>one</key>
+			<string>%d приглашение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d новое сообщение</string>
 			<key>few</key>
 			<string>%d новых сообщения</string>
 			<key>many</key>
 			<string>%d новых сообщений</string>
+			<key>one</key>
+			<string>%d новое сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d непрочитанное уведомление</string>
 			<key>few</key>
 			<string>%d непрочитанных уведомления</string>
 			<key>many</key>
 			<string>%d непрочитанных уведомлений</string>
+			<key>one</key>
+			<string>%d непрочитанное уведомление</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d комната</string>
 			<key>few</key>
 			<string>%d комнаты</string>
 			<key>many</key>
 			<string>%d комнат</string>
+			<key>one</key>
+			<string>%d комната</string>
 		</dict>
-	</dict>
-	<key>screen_app_lock_subtitle</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,300 +317,336 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>У вас осталась %1$d попытка разблокировки</string>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_app_lock_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>У вас остались %1$d попытки разблокировки</string>
 			<key>many</key>
 			<string>У вас осталось %1$d попыток разблокировки</string>
+			<key>one</key>
+			<string>У вас осталась %1$d попытка разблокировки</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Неверный PIN-код. У вас осталась %1$d попытка</string>
 			<key>few</key>
 			<string>Неверный PIN-код. У вас остались %1$d попытки</string>
 			<key>many</key>
 			<string>Неверный PIN-код. У вас осталось %1$d попыток</string>
+			<key>one</key>
+			<string>Неверный PIN-код. У вас осталась %1$d попытка</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Покинуть %1$d комнату и пространство</string>
 			<key>few</key>
 			<string>Покинуть %1$d комнат и пространство</string>
 			<key>many</key>
 			<string>Покинуть %1$d комнат и пространство</string>
+			<key>one</key>
+			<string>Покинуть %1$d комнату и пространство</string>
 		</dict>
-	</dict>
-	<key>screen_pinned_timeline_screen_title</key>
-	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>few</key>
+			<string>%1$d человек</string>
+			<key>many</key>
+			<string>%1$d людей</string>
 			<key>one</key>
-			<string>%1$d закреплённое сообщение</string>
+			<string>%1$d человек</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_pinned_timeline_screen_title</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
 			<key>few</key>
 			<string>%1$d закреплённых сообщения</string>
 			<key>many</key>
 			<string>%1$d закреплённых сообщений</string>
+			<key>one</key>
+			<string>%1$d закреплённое сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d заблокирован</string>
 			<key>few</key>
 			<string>%1$d заблокированы</string>
 			<key>many</key>
 			<string>%1$d заблокированы</string>
+			<key>one</key>
+			<string>%1$d заблокирован</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d пользователь</string>
 			<key>few</key>
 			<string>%1$d пользователя</string>
 			<key>many</key>
 			<string>%1$d пользователей</string>
+			<key>one</key>
+			<string>%1$d пользователь</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d приглашён</string>
 			<key>few</key>
 			<string>%1$d приглашены</string>
 			<key>many</key>
 			<string>%1$d приглашены</string>
+			<key>one</key>
+			<string>%1$d приглашён</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d хочет присоединиться к этой комнате</string>
 			<key>few</key>
 			<string>%1$@ +%2$d хотят присоединиться к этой комнате</string>
 			<key>many</key>
 			<string>%1$@ +%2$d хотят присоединиться к этой комнате</string>
+			<key>one</key>
+			<string>%1$@ +%2$d хочет присоединиться к этой комнате</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d участник отреагировал %2$@</string>
 			<key>few</key>
 			<string>%1$d участника отреагировало %2$@</string>
 			<key>many</key>
 			<string>%1$d участников отреагировало %2$@</string>
+			<key>one</key>
+			<string>%1$d участник отреагировал %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Вы и %1$d участник отреагировали %2$@</string>
 			<key>few</key>
 			<string>Вы и %1$d участника отреагировали %2$@</string>
 			<key>many</key>
 			<string>Вы и %1$d участников отреагировали %2$@</string>
+			<key>one</key>
+			<string>Вы и %1$d участник отреагировали %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d изменение в комнате</string>
 			<key>few</key>
 			<string>%1$d изменения в комнате</string>
 			<key>many</key>
 			<string>%1$d изменений в комнате</string>
+			<key>one</key>
+			<string>%1$d изменение в комнате</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ и %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ и другие %3$d</string>
 			<key>many</key>
 			<string>%1$@, %2$@ и другие %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ и %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ печатает</string>
 			<key>few</key>
 			<string>%1$@ печатают</string>
 			<key>many</key>
 			<string>%1$@ печатают</string>
+			<key>one</key>
+			<string>%1$@ печатает</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Удалить %1$d комнату из %2$@</string>
 			<key>few</key>
 			<string>Удалить %1$d комнаты из %2$@</string>
 			<key>many</key>
 			<string>Удалить %1$d комнат из %2$@</string>
+			<key>one</key>
+			<string>Удалить %1$d комнату из %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Вы заблокировали пользователя %1$d. Вы не будете получать уведомления от этого пользователей.</string>
 			<key>few</key>
 			<string>Вы заблокировали пользователей %1$d. Вы не будете получать уведомления от этих пользователей.</string>
 			<key>many</key>
 			<string>Вы заблокировали пользователей %1$d. Вы не будете получать уведомления от этих пользователей.</string>
+			<key>one</key>
+			<string>Вы заблокировали пользователя %1$d. Вы не будете получать уведомления от этого пользователей.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Найден %1$d push-провайдер: %2$@</string>
 			<key>few</key>
 			<string>Найдено %1$d push-провайдеров: %2$@</string>
 			<key>many</key>
 			<string>Найдено %1$d push-провайдеров: %2$@</string>
+			<key>one</key>
+			<string>Найден %1$d push-провайдер: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d провайдер найден: %2$@.</string>
 			<key>few</key>
 			<string>%1$d провайдеров найдено: %2$@.</string>
 			<key>many</key>
 			<string>%1$d провайдеров найдено: %2$@.</string>
+			<key>one</key>
+			<string>%1$d провайдер найден: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/sk.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/sk.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict
@@ -4,224 +4,222 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zadaná číslica</string>
 			<key>few</key>
 			<string>%1$d zadané číslice</string>
+			<key>one</key>
+			<string>%1$d zadaná číslica</string>
 			<key>other</key>
 			<string>%1$d zadaných číslic</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d percento z celkového počtu hlasov</string>
 			<key>few</key>
 			<string>%1$d percentá z celkového počtu hlasov</string>
+			<key>one</key>
+			<string>%1$d percento z celkového počtu hlasov</string>
 			<key>other</key>
 			<string>%1$d percent z celkového počtu hlasov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Prečítal/a %1$@ a %2$d ďalší</string>
 			<key>few</key>
 			<string>Prečítal/a %1$@ a %2$d ďalší</string>
+			<key>one</key>
+			<string>Prečítal/a %1$@ a %2$d ďalší</string>
 			<key>other</key>
 			<string>Prečítal/a %1$@ a %2$d ďalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d ďalší</string>
 			<key>few</key>
 			<string>%d ďalší</string>
+			<key>one</key>
+			<string>%d ďalší</string>
 			<key>other</key>
 			<string>%d ďalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen</string>
 			<key>few</key>
 			<string>%1$d členovia</string>
+			<key>one</key>
+			<string>%1$d člen</string>
 			<key>other</key>
 			<string>%1$d členov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d hlas</string>
 			<key>few</key>
 			<string>%d hlasy</string>
+			<key>one</key>
+			<string>%d hlas</string>
 			<key>other</key>
 			<string>%d hlasov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odpoveď</string>
 			<key>few</key>
 			<string>%1$d odpovede</string>
+			<key>one</key>
+			<string>%1$d odpoveď</string>
 			<key>other</key>
 			<string>%1$d odpovedí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d miestnosť</string>
 			<key>few</key>
 			<string>%1$d miestnosti</string>
+			<key>one</key>
+			<string>%1$d miestnosť</string>
 			<key>other</key>
 			<string>%1$d miestností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vybraná</string>
 			<key>few</key>
 			<string>%1$d vybrané</string>
+			<key>one</key>
+			<string>%1$d vybraná</string>
 			<key>other</key>
 			<string>%1$d vybraných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d priestor</string>
 			<key>few</key>
 			<string>%1$d priestory</string>
+			<key>one</key>
+			<string>%1$d priestor</string>
 			<key>other</key>
 			<string>%1$d priestorov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d správa</string>
 			<key>few</key>
 			<string>%1$@: %2$d správy</string>
+			<key>one</key>
+			<string>%1$@: %2$d správa</string>
 			<key>other</key>
 			<string>%1$@: %2$d správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d oznámenie</string>
 			<key>few</key>
 			<string>%d oznámenia</string>
+			<key>one</key>
+			<string>%d oznámenie</string>
 			<key>other</key>
 			<string>%d oznámení</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -233,384 +231,418 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozvánka</string>
 			<key>few</key>
 			<string>%d pozvánky</string>
+			<key>one</key>
+			<string>%d pozvánka</string>
 			<key>other</key>
 			<string>%d pozvánok</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nová správa</string>
 			<key>few</key>
 			<string>%d nové správy</string>
+			<key>one</key>
+			<string>%d nová správa</string>
 			<key>other</key>
 			<string>%d nových správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d neprečítaná oznámená správa</string>
 			<key>few</key>
 			<string>%d neprečítané oznámené správy</string>
+			<key>one</key>
+			<string>%d neprečítaná oznámená správa</string>
 			<key>other</key>
 			<string>%d neprečítaných oznámených správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d miestnosť</string>
 			<key>few</key>
 			<string>%d miestnosti</string>
+			<key>one</key>
+			<string>%d miestnosť</string>
 			<key>other</key>
 			<string>%d miestností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %1$d pokus na odomknutie</string>
 			<key>few</key>
 			<string>Máte %1$d pokusy na odomknutie</string>
+			<key>one</key>
+			<string>Máte %1$d pokus na odomknutie</string>
 			<key>other</key>
 			<string>Máte %1$d pokusov na odomknutie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nesprávny PIN kód. Máte ešte %1$d pokus</string>
 			<key>few</key>
 			<string>Nesprávny PIN kód. Máte ešte %1$d pokusy</string>
+			<key>one</key>
+			<string>Nesprávny PIN kód. Máte ešte %1$d pokus</string>
 			<key>other</key>
 			<string>Nesprávny PIN kód. Máte ešte %1$d pokusov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opustiť %1$d miestnosť a priestor</string>
 			<key>few</key>
 			<string>Opustiť %1$d miestnosti a priestory</string>
+			<key>one</key>
+			<string>Opustiť %1$d miestnosť a priestor</string>
 			<key>other</key>
 			<string>Opustiť %1$d miestností a priestorov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pripnutá správa</string>
 			<key>few</key>
 			<string>%1$d pripnuté správy</string>
+			<key>one</key>
+			<string>%1$d pripnutá správa</string>
 			<key>other</key>
 			<string>%1$d pripnutých správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zakázaný</string>
 			<key>few</key>
 			<string>%1$d zakázaní</string>
+			<key>one</key>
+			<string>%1$d zakázaný</string>
 			<key>other</key>
 			<string>%1$d zakázaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 			<key>other</key>
 			<string>%1$d osôb</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozvaný</string>
 			<key>few</key>
 			<string>%1$d pozvaní</string>
+			<key>one</key>
+			<string>%1$d pozvaný</string>
 			<key>other</key>
 			<string>%1$d pozvaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
 			<key>few</key>
 			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
+			<key>one</key>
+			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
 			<key>other</key>
 			<string>%1$@ +%2$d ďalších chce vstúpiť do tejto miestnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>%1$d členovia reagovali s %2$@</string>
+			<key>one</key>
+			<string>%1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>%1$d členov reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vy a %1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>Vy a %1$d členovia reagovali s %2$@</string>
+			<key>one</key>
+			<string>Vy a %1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>Vy a %1$d členov reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zmena miestnosti</string>
 			<key>few</key>
 			<string>%1$d zmeny miestnosti</string>
+			<key>one</key>
+			<string>%1$d zmena miestnosti</string>
 			<key>other</key>
 			<string>%1$d zmien miestnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ a %3$d ďalší</string>
 			<key>few</key>
 			<string>%1$@, %2$@ a %3$d ďalší</string>
+			<key>one</key>
+			<string>%1$@, %2$@ a %3$d ďalší</string>
 			<key>other</key>
 			<string>%1$@, %2$@ a %3$d ďalší</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ píše</string>
 			<key>few</key>
 			<string>%1$@ píšu</string>
+			<key>one</key>
+			<string>%1$@ píše</string>
 			<key>other</key>
 			<string>%1$@ píšu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odstrániť %1$d miestnosť z priestoru %2$@</string>
 			<key>few</key>
 			<string>Odstrániť %1$d miestnosti z priestoru %2$@</string>
+			<key>one</key>
+			<string>Odstrániť %1$d miestnosť z priestoru %2$@</string>
 			<key>other</key>
 			<string>Odstrániť %1$d miestností z priestoru %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokovali ste %1$d používateľa. Nebudete dostávať oznámenia od tohto používateľa.</string>
 			<key>few</key>
 			<string>Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov.</string>
+			<key>one</key>
+			<string>Zablokovali ste %1$d používateľa. Nebudete dostávať oznámenia od tohto používateľa.</string>
 			<key>other</key>
 			<string>Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nájdený %1$d poskytovateľ služby push: %2$@</string>
 			<key>few</key>
 			<string>Nájdení %1$d poskytovatelia služby push: %2$@</string>
+			<key>one</key>
+			<string>Nájdený %1$d poskytovateľ služby push: %2$@</string>
 			<key>other</key>
 			<string>Nájdených %1$d poskytovateľov služby push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d nájdený distribútor: %2$@.</string>
 			<key>few</key>
 			<string>%1$d nájdení distribútori: %2$@.</string>
+			<key>one</key>
+			<string>%1$d nájdený distribútor: %2$@.</string>
 			<key>other</key>
 			<string>%1$d nájdených distribútorov: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/sv.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/sv.lproj/Localizable.strings
--- a/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d siffror angivna</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d procent av totala röster</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Läst av %1$@ och %2$d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d röster</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Utrymmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d aviseringar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d inbjudningar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nya meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d olästa aviserade meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,27 @@
 			<key>other</key>
 			<string>%d rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_advanced_settings_live_location_update_distance</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Every %1$d meter</string>
+			<key>other</key>
+			<string>Every %1$d meters</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +303,11 @@
 			<key>other</key>
 			<string>Du har %1$d försök att låsa upp</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +319,11 @@
 			<key>other</key>
 			<string>Fel PIN-kod. Du har %1$d försök kvar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +335,27 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+	</dict>
+	<key>screen_live_location_sheet_subtitle</key>
+	<dict>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d person</string>
+			<key>other</key>
+			<string>%1$d people</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Fästa meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d Personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@+ %2$d andra vill gå med i detta rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d medlemmar reagerade med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +463,11 @@
 			<key>other</key>
 			<string>Du och %1$d medlemmarna reagerade med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +479,11 @@
 			<key>other</key>
 			<string>%1$d rumsändringar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +495,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ och %3$d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +511,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +527,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +543,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +559,11 @@
 			<key>other</key>
 			<string>Hittade %1$d push-leverantörer: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +575,8 @@
 			<key>other</key>
 			<string>%1$d distributörer hittade:%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
 </plist>
--- a/ElementX/Resources/Localizations/tr.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/tr.lproj/Localizable.strings
--- a/Show More
+++ b/Show More