Dylib

Add linking instruction everywhere
Use aarch64-apple-ios instead
2025-12-05 23:53:33 +00:00 · 2023-04-27 14:38:32 +02:00 · 2023-04-24 15:44:41 +02:00 · 2023-04-24 15:17:52 +02:00 · 2023-04-24 14:57:12 +02:00
199 changed files with 2533 additions and 10939 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Customer Support
-    url: https://bitwarden.com/contact/
-    about: Please contact our customer support for account issues and general customer support.
  - name: Report mobile autofill failure
    url: https://docs.google.com/forms/d/e/1FAIpQLScMopHyN7KGJs8hW562VTzbIGL4KcFnx0wJcsW0GYE1BnPiGA/viewform
    about: We are aware of some situations where the Bitwarden mobile app will not autofill information correctly. This is something the Bitwarden team is actively working on but need your help as a community and active Bitwarden users!
@@ -12,6 +9,9 @@ contact_links:
  - name: Bitwarden Community Forums
    url: https://community.bitwarden.com
    about: Please visit the community forums for general community discussion, support and the development roadmap.
+  - name: Customer Support
+    url: https://bitwarden.com/contact/
+    about: Please contact our customer support for account issues and general customer support.
  - name: Security Issues
    url: https://hackerone.com/bitwarden
    about: We use HackerOne to manage security disclosures.
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,19 +0,0 @@
-android:
- src/App/*
- src/Core/*
- src/Android/*
-
-iOS:
- src/App/*
- src/Core/*
- lib/ios/*
- src/iOS/*
- 'src/iOS.Autofill/*'
- 'src/iOS.Core/*'
- 'src/iOS.Extension/*'
- 'src/iOS.ShareExtension/*'
- 'src/iOS.Widget/*'
- src/watchOS/*
-
-watchOS:
- src/watchOS/*
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,37 +1,22 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":combinePatchMinorReleases",
-    ":dependencyDashboard",
-    ":maintainLockFilesWeekly",
-    ":pinAllExceptPeerDependencies",
-    ":prConcurrentLimit10",
-    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
-  ],
-  "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
-  "packageRules": [
-    {
-      "groupName": "cargo minor",
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "gh minor",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "groupName": "nuget minor",
-      "matchManagers": ["nuget"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-  ]
-}
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+      "config:base",
+      "schedule:monthly",
+      ":maintainLockFilesMonthly",
+      ":preserveSemverRanges",
+      ":rebaseStalePrs",
+      ":disableDependencyDashboard"
+    ],
+    "enabledManagers": [
+      "nuget"
+    ],
+    "packageRules": [
+      {
+        "matchManagers": ["nuget"],
+        "groupName": "Nuget updates",
+        "groupSlug": "nuget",
+        "separateMajorMinor": false
+      }
+    ]
+  }
--- a/.github/workflows/automatic-issue-responses.yml
+++ b/.github/workflows/automatic-issue-responses.yml
@@ -14,7 +14,7 @@ jobs:
      # Feature request
      - if: github.event.label.name == 'feature-request'
        name: Feature request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We use GitHub issues as a place to track bugs and other development related issues. The [Bitwarden Community Forums](https://community.bitwarden.com/) has a [Feature Requests](https://community.bitwarden.com/c/feature-requests) section for submitting, voting for, and discussing requests like this one.
@@ -25,7 +25,7 @@ jobs:
      # Intended behavior
      - if: github.event.label.name == 'intended-behavior'
        name: Intended behaviour
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            Your issue appears to be describing the intended behavior of the software. If you want this to be changed, it would be a feature request.
@@ -38,7 +38,7 @@ jobs:
      # Customer support request
      - if: github.event.label.name == 'customer-support'
        name: Customer Support request
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We use GitHub issues as a place to track bugs and other development related issues. Your issue appears to be a support request, or would otherwise be better handled by our dedicated Customer Success team.
@@ -49,14 +49,14 @@ jobs:
      # Resolved
      - if: github.event.label.name == 'resolved'
        name: Resolved
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            We’ve closed this issue, as it appears the original problem has been resolved. If this happens again or continues to be an problem, please respond to this issue with any additional detail to assist with reproduction and root cause analysis.
      # Stale
      - if: github.event.label.name == 'stale'
        name: Stale
-        uses: peter-evans/close-issue@276d7966e389d888f011539a86c8920025ea0626  # v3.0.1
+        uses: peter-evans/close-issue@849549ba7c3a595a064c4b2c56f206ee78f93515  # v2.0.0
        with:
          comment: |
            As we haven’t heard from you about this problem in some time, this issue will now be closed.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

      - name: Set up CLOC
        run: |
@@ -36,7 +36,7 @@ jobs:
      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          submodules: 'true'

@@ -67,12 +67,12 @@ jobs:
        variant: ["prod", "qa"]
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab

      - name: Setup Windows builder
        run: choco install checksum --no-progress
@@ -105,7 +105,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          fetch-depth: 0
      - name: Decrypt secrets
@@ -157,7 +157,7 @@ jobs:
        shell: pwsh

      - name: Report test results
-        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226 # v1.6.0
+        uses: dorny/test-reporter@c9b3d0e2bd2a4e96aaf424dbaa31c46b42318226
        if: always()
        with:
          name: Test Results
@@ -191,7 +191,7 @@ jobs:
          $androidPath = $($env:GITHUB_WORKSPACE + "/src/Android/Android.csproj");
          $packageName = "com.x8bit.bitwarden";

-          if ("${{ matrix.variant }}" -ne "prod")
+          if ("${{ matrix.variant }}" -ne "prod") 
          {
            $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
          }
@@ -232,7 +232,7 @@ jobs:
        shell: pwsh
      - name: Upload Prod .aab artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.aab
          path: ./com.x8bit.bitwarden.aab
@@ -240,7 +240,7 @@ jobs:

      - name: Upload Prod .apk artifact
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.apk
          path: ./com.x8bit.bitwarden.apk
@@ -248,7 +248,7 @@ jobs:

      - name: Upload Other .apk artifact
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
          path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -268,7 +268,7 @@ jobs:

      - name: Upload .apk sha file for prod
        if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-android-apk-sha256.txt
          path: ./bw-android-apk-sha256.txt
@@ -276,7 +276,7 @@ jobs:

      - name: Upload .apk sha file for other
        if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-android-${{ matrix.variant }}-apk-sha256.txt
          path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
@@ -303,12 +303,12 @@ jobs:
    runs-on: windows-2022
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
+        uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab

      - name: Setup Windows builder
        run: choco install checksum --no-progress
@@ -342,7 +342,7 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

      - name: Decrypt secrets
        env:
@@ -477,7 +477,7 @@ jobs:
        shell: pwsh

      - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: com.x8bit.bitwarden-fdroid.apk
          path: ./com.x8bit.bitwarden-fdroid.apk
@@ -489,7 +489,7 @@ jobs:
            -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt

      - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: bw-fdroid-apk-sha256.txt
          path: ./bw-fdroid-apk-sha256.txt
@@ -502,7 +502,7 @@ jobs:
    needs: setup
    steps:
      - name: Setup NuGet
-        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
+        uses: nuget/setup-nuget@b2bc17b761a1d88cab755a776c7922eb26eefbfa # v1.0.6
        with:
          nuget-version: 5.9.0

@@ -515,19 +515,19 @@ jobs:
          echo "GitHub event: $GITHUB_EVENT"

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
        with:
          submodules: 'true'

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            appcenter-ios-token
        run: |
@@ -698,7 +698,7 @@ jobs:
        shell: bash

      - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: Bitwarden iOS
          path: |
@@ -771,17 +771,17 @@ jobs:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            crowdin-api-token
        run: |
@@ -793,7 +793,7 @@ jobs:
          done

      - name: Upload Sources
-        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@9237b4cb361788dfce63feb2e2f15c09e2fe7415
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -839,17 +839,17 @@ jobs:
              exit 1
          fi

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        if: failure()
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
        if: failure()
        env:
-          KEYVAULT: bitwarden-ci
+          KEYVAULT: bitwarden-prod-kv
          SECRETS: |
            devops-alerts-slack-webhook-url
        run: |
@@ -861,7 +861,7 @@ jobs:
          done

      - name: Notify Slack on failure
-        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
+        uses: act10ns/slack@da3191ebe2e67f49b46880b4633f5591a96d1d33
        if: failure()
        env:
          SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -15,22 +15,22 @@ jobs:
      _CROWDIN_PROJECT_ID: "269690"
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af 
        with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"               
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Download translations
-        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@12143a68c213f3c6d9913c9e5023224f7231face
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -48,4 +48,4 @@ jobs:
          pull_request_title: "Autosync Crowdin Translations"
          pull_request_body: "Autosync the updated translations"
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
-          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
+          gpg_passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}   
--- a/.github/workflows/enforce-labels.yml
+++ b/.github/workflows/enforce-labels.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Enforce Label
-        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # v2.2.2
+        uses: yogevbd/enforce-label-action@8d1e1709b1011e6d90400a0e6cf7c0b77aa5efeb
        with:
          BANNED_LABELS: "hold,needs-qa"
          BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -1,17 +0,0 @@
---
-name: "Pull Request Labeler"
-
-on:
-  pull_request_target: {}
-
-jobs:
-  labeler:
-    name: "Pull Request Labeler"
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
-        with:
-          sync-labels: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,11 +38,11 @@ jobs:
          fi

      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0

      - name: Check Release Version
        id: version
-        uses: bitwarden/gh-actions/release-version-check@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
        with:
          release-type: ${{ github.event.inputs.release_type }}
          project-type: xamarin
@@ -56,7 +56,7 @@ jobs:

      - name: Create GitHub deployment
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: chrnorm/deployment-action@d42cde7132fcec920de534fffc3be83794335c00 # v2.0.5
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
        id: deployment
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
@@ -104,7 +104,7 @@ jobs:

      - name: Update deployment status to Success
        if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
          state: 'success'
@@ -112,7 +112,7 @@ jobs:

      - name: Update deployment status to Failure
        if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
          state: 'failure'
@@ -126,7 +126,7 @@ jobs:
    if: inputs.fdroid_publish
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0

      - name: Download F-Droid .apk artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -14,7 +14,7 @@ jobs:
      version_number: ${{ steps.version.outputs.new-version }}
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

      - name: Calculate bumped version
        id: version
@@ -40,6 +40,6 @@ jobs:
      - name: Bump version to ${{ needs.setup.outputs.version_number }}
        uses: ./.github/workflows/version-bump.yml
        secrets:
-          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
        with:
          version_number: ${{ needs.setup.outputs.version_number }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -11,7 +11,6 @@ on:
    inputs:
      version_number:
        required: true
-        type: string
    secrets:
      AZURE_PROD_KV_CREDENTIALS:
        required: true
@@ -22,22 +21,22 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+      - name: Login to Azure - Prod Subscription
+        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
        with:
-         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+         creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
        with:
-          keyvault: "bitwarden-ci"
+          keyvault: "bitwarden-prod-kv"
          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"

      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5.2.0
+        uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1
        with:
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
          passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -48,31 +47,31 @@ jobs:
        run: git switch -c version_bump_${{ github.event.inputs.version_number }}

      - name: Bump Version - Android XML
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/Android/Properties/AndroidManifest.xml"

      - name: Bump Version - iOS.Autofill
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Autofill/Info.plist"

      - name: Bump Version - iOS.Extension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.Extension/Info.plist"

      - name: Bump Version - iOS.ShareExtension
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS.ShareExtension/Info.plist"

      - name: Bump Version - iOS
-        uses: bitwarden/gh-actions/version-bump@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
        with:
          version: ${{ github.event.inputs.version_number }}
          file_path: "./src/iOS/Info.plist"
--- a/.github/workflows/workflow-linter.yml
+++ b/.github/workflows/workflow-linter.yml
@@ -8,4 +8,4 @@ on:

 jobs:
  call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@34ecb67b2a357795dc893549df0795e7383ff50f
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master
--- a/lib/ios/libbitwarden_c.a
+++ b/lib/ios/libbitwarden_c.a
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -78,20 +78,21 @@
      <Version>1.9.0</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.16" />
-    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.19" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.0" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.14" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.17" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.15" />
    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.3.1.1" />
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.7.5</Version>
+      <Version>1.7.3</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Firebase.Messaging">
-      <Version>123.1.1.1</Version>
+      <Version>123.0.8</Version>
    </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.41.0.2" />
    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
-      <Version>118.0.1.3</Version>
+      <Version>118.0.1.2</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -44,7 +44,6 @@ namespace Bit.Droid
        private IAppIdService _appIdService;
        private IEventService _eventService;
        private IPushNotificationListenerService _pushNotificationListenerService;
-        private IVaultTimeoutService _vaultTimeoutService;
        private ILogger _logger;
        private PendingIntent _eventUploadPendingIntent;
        private AppOptions _appOptions;
@@ -69,7 +68,6 @@ namespace Bit.Droid
            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
            _eventService = ServiceContainer.Resolve<IEventService>("eventService");
            _pushNotificationListenerService = ServiceContainer.Resolve<IPushNotificationListenerService>();
-            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
            _logger = ServiceContainer.Resolve<ILogger>("logger");

            TabLayoutResource = Resource.Layout.Tabbar;
@@ -234,7 +232,6 @@ namespace Bit.Droid

        protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
        {
-            _vaultTimeoutService.ResetTimeoutDelay = true;
            if (resultCode == Result.Ok &&
               (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode))
            {
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -21,7 +21,6 @@ using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
-using Bit.Core.Enums;
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -148,7 +147,7 @@ namespace Bit.Droid
            var storageMediatorService = new StorageMediatorService(mobileStorageService, secureStorageService, preferencesStorage);
            var stateService = new StateService(mobileStorageService, secureStorageService, storageMediatorService, messagingService);
            var stateMigrationService =
-                new StateMigrationService(DeviceType.Android, liteDbStorage, preferencesStorage, secureStorageService);
+                new StateMigrationService(liteDbStorage, preferencesStorage, secureStorageService);
            var clipboardService = new ClipboardService(stateService);
            var deviceActionService = new DeviceActionService(stateService, messagingService);
            var fileService = new FileService(stateService, broadcasterService);
@@ -156,7 +155,7 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
+            var biometricService = new BiometricService();
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.5.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.3.3" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -4,6 +4,7 @@ using Android.OS;
 using Android.Security.Keystore;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
+using Bit.Core.Utilities;
 using Java.Security;
 using Javax.Crypto;

@@ -11,8 +12,6 @@ namespace Bit.Droid.Services
 {
    public class BiometricService : IBiometricService
    {
-        private readonly IStateService _stateService;
-
        private const string KeyName = "com.8bit.bitwarden.biometric_integrity";

        private const string KeyStoreName = "AndroidKeyStore";
@@ -24,28 +23,28 @@ namespace Bit.Droid.Services

        private readonly KeyStore _keystore;

-        public BiometricService(IStateService stateService)
+        public BiometricService()
        {
-            _stateService = stateService;
            _keystore = KeyStore.GetInstance(KeyStoreName);
            _keystore.Load(null);
        }

-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public Task<bool> SetupBiometricAsync(string bioIntegrityKey = null)
        {
+            // bioIntegrityKey used in iOS only
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
            }

-            return true;
+            return Task.FromResult(true);
        }

-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public Task<bool> ValidateIntegrityAsync(string bioIntegrityKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
-                return true;
+                return Task.FromResult(true);
            }

            try
@@ -56,7 +55,7 @@ namespace Bit.Droid.Services

                if (key == null || cipher == null)
                {
-                    return true;
+                    return Task.FromResult(true);
                }

                cipher.Init(CipherMode.EncryptMode, key);
@@ -64,32 +63,25 @@ namespace Bit.Droid.Services
            catch (KeyPermanentlyInvalidatedException e)
            {
                // Biometric has changed
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
            }
            catch (UnrecoverableKeyException e)
            {
                // Biometric was disabled and re-enabled
-                await ClearStateAsync(bioIntegritySrcKey);
-                return false;
+                return Task.FromResult(false);
            }
            catch (InvalidKeyException e)
            {
                // Fallback for old bitwarden users without a key
                LoggerHelper.LogEvenIfCantBeResolved(e);
-                await CreateKeyAsync(bioIntegritySrcKey);
+                CreateKey();
            }

-            return true;
+            return Task.FromResult(true);
        }

-        private async Task CreateKeyAsync(string bioIntegritySrcKey = null)
+        private void CreateKey()
        {
-            bioIntegritySrcKey ??= Core.Constants.BiometricIntegritySourceKey;
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey,
-                await GetStateAsync(bioIntegritySrcKey));
-            await _stateService.SetAccountBiometricIntegrityValidAsync(bioIntegritySrcKey);
-
            try
            {
                var keyGen = KeyGenerator.GetInstance(KeyAlgorithm, KeyStoreName);
@@ -109,16 +101,5 @@ namespace Bit.Droid.Services
                LoggerHelper.LogEvenIfCantBeResolved(e);
            }
        }
-
-        private async Task<string> GetStateAsync(string bioIntegritySrcKey)
-        {
-            return await _stateService.GetSystemBiometricIntegrityState(bioIntegritySrcKey) ??
-                   Guid.NewGuid().ToString();
-        }
-
-        private async Task ClearStateAsync(string bioIntegritySrcKey)
-        {
-            await _stateService.SetSystemBiometricIntegrityState(bioIntegritySrcKey, null);
-        }
    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -14,11 +14,11 @@

  <ItemGroup>
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
-    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.2" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.5" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
    <PackageReference Include="MessagePack" Version="2.4.59" />
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -38,7 +38,6 @@ namespace Bit.App
        private readonly IFileService _fileService;
        private readonly IAccountsManager _accountsManager;
        private readonly IPushNotificationService _pushNotificationService;
-        private readonly IConfigService _configService;
        private static bool _isResumed;
        // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
        private static bool _pendingCheckPasswordlessLoginRequests;
@@ -62,7 +61,6 @@ namespace Bit.App
            _fileService = ServiceContainer.Resolve<IFileService>();
            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
-            _configService = ServiceContainer.Resolve<IConfigService>();

            _accountsManager.Init(() => Options, this);

@@ -163,18 +161,6 @@ namespace Bit.App
                                new NavigationPage(new RemoveMasterPasswordPage()));
                        });
                    }
-                    else if (message.Command == Constants.ForceUpdatePassword)
-                    {
-                        Device.BeginInvokeOnMainThread(async () =>
-                        {
-                            await Application.Current.MainPage.Navigation.PushModalAsync(
-                                new NavigationPage(new UpdateTempPasswordPage()));
-                        });
-                    }
-                    else if (message.Command == "syncCompleted")
-                    {
-                        await _configService.GetAsync(true);
-                    }
                    else if (message.Command == Constants.PasswordlessLoginRequestKey
                        || message.Command == "unlocked"
                        || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
@@ -297,10 +283,8 @@ namespace Bit.App
            {
                await _vaultTimeoutService.CheckVaultTimeoutAsync();
                // Reset delay on every start
-                _vaultTimeoutService.DelayTimeoutMs = null;
+                _vaultTimeoutService.DelayLockAndLogoutMs = null;
            }
-
-            await _configService.GetAsync();
            _messagingService.Send("startEventTimer");
        }

--- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
+++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
@@ -1,7 +1,10 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
@@ -70,13 +73,13 @@ namespace Bit.App.Pages
            set => SetProperty(ref _policy, value);
        }

-        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
+        public string ShowPasswordIcon => ShowPassword ? "" : "";
        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
        public string MasterPassword { get; set; }
        public string ConfirmMasterPassword { get; set; }
        public string Hint { get; set; }

-        public virtual async Task InitAsync(bool forceSync = false)
+        public async Task InitAsync(bool forceSync = false)
        {
            if (forceSync)
            {
--- a/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
+++ b/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;

@@ -19,8 +18,7 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");

            PageTitle = AppResources.Settings;
-            BaseUrl = _environmentService.BaseUrl == EnvironmentUrlData.DefaultEU.Base || EnvironmentUrlData.DefaultUS.Base == _environmentService.BaseUrl ?
-                string.Empty : _environmentService.BaseUrl;
+            BaseUrl = _environmentService.BaseUrl;
            WebVaultUrl = _environmentService.WebVaultUrl;
            ApiUrl = _environmentService.ApiUrl;
            IdentityUrl = _environmentService.IdentityUrl;
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -25,6 +25,10 @@
            AutomationProperties.IsInAccessibleTree="True"
            AutomationProperties.Name="{u:I18n Account}" />
        <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
+        <ToolbarItem
+            Icon="cog_environment.png" Clicked="Environment_Clicked" Order="Primary"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Options}" />
    </ContentPage.ToolbarItems>

    <ContentPage.Resources>
@@ -62,27 +66,7 @@
                    </Entry>
                    <StackLayout
                        Orientation="Horizontal"
-                        Margin="0, 6, 0 ,0">
-                        <StackLayout.GestureRecognizers>
-                            <TapGestureRecognizer
-                                Command="{Binding ShowEnvironmentPickerCommand}" />
-                        </StackLayout.GestureRecognizers>
-                        <Label
-                            Text="{Binding RegionText}"
-                            FontSize="13"
-                            TextColor="{DynamicResource MutedColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                        <controls:IconLabel
-                            Text="{Binding SelectedEnvironmentName}"
-                            FontSize="13"
-                            TextColor="{DynamicResource PrimaryColor}"
-                            VerticalOptions="Center"
-                            VerticalTextAlignment="Center"/>
-                    </StackLayout>
-                    <StackLayout
-                        Orientation="Horizontal"
-                        Margin="0, 20, 0 ,0">
+                        Margin="0, 16, 0 ,0">
                        <StackLayout.GestureRecognizers>
                            <TapGestureRecognizer
                                Command="{Binding RememberEmailCommand}" />
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -15,8 +15,6 @@ namespace Bit.App.Pages
        private readonly AppOptions _appOptions;
        private IBroadcasterService _broadcasterService;

-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
        public HomePage(AppOptions appOptions = null)
        {
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
@@ -72,14 +70,6 @@ namespace Bit.App.Pages
                    });
                }
            });
-            try
-            {
-                await _vm.UpdateEnvironment();
-            }
-            catch (Exception ex)
-            {
-                _logger.Value?.Exception(ex);
-            }
        }

        protected override bool OnBackButtonPressed()
@@ -138,6 +128,14 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

+        private void Environment_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.StartEnvironmentAction();
+            }
+        }
+
        private async Task StartEnvironmentAsync()
        {
            await _accountListOverlay.HideAsync();
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -4,10 +4,7 @@ using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.Core;
 using Bit.Core.Abstractions;
-using Bit.Core.Models.Data;
-using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -20,19 +17,16 @@ namespace Bit.App.Pages
    {
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly ILogger _logger;
-        private readonly IEnvironmentService _environmentService;
-        private readonly IAccountsManager _accountManager;
-        private readonly IConfigService _configService;

        private bool _showCancelButton;
        private bool _rememberEmail;
        private string _email;
-        private string _selectedEnvironmentName;
        private bool _isEmailEnabled;
        private bool _canLogin;
-        private bool _displayEuEnvironment;
+        private IPlatformUtilsService _platformUtilsService;
+        private ILogger _logger;
+        private IEnvironmentService _environmentService;
+        private IAccountsManager _accountManager;

        public HomeViewModel()
        {
@@ -42,7 +36,6 @@ namespace Bit.App.Pages
            _logger = ServiceContainer.Resolve<ILogger>();
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>();
            _accountManager = ServiceContainer.Resolve<IAccountsManager>();
-            _configService = ServiceContainer.Resolve<IConfigService>();

            PageTitle = AppResources.Bitwarden;

@@ -56,8 +49,6 @@ namespace Bit.App.Pages
                onException: _logger.Exception, allowsMultipleExecutions: false);
            CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
                onException: _logger.Exception, allowsMultipleExecutions: false);
-            ShowEnvironmentPickerCommand = new AsyncCommand(ShowEnvironmentPickerAsync,
-                onException: _logger.Exception, allowsMultipleExecutions: false);
            InitAsync().FireAndForget();
        }

@@ -80,13 +71,6 @@ namespace Bit.App.Pages
                additionalPropertyNames: new[] { nameof(CanContinue) });
        }

-        public string SelectedEnvironmentName
-        {
-            get => $"{_selectedEnvironmentName} {BitwardenIcons.AngleDown}";
-            set => SetProperty(ref _selectedEnvironmentName, value);
-        }
-
-        public string RegionText => $"{AppResources.Region}:";
        public bool CanContinue => !string.IsNullOrEmpty(Email);

        public FormattedString CreateAccountText
@@ -117,13 +101,11 @@ namespace Bit.App.Pages
        public AsyncCommand ContinueCommand { get; }
        public AsyncCommand CloseCommand { get; }
        public AsyncCommand CreateAccountCommand { get; }
-        public AsyncCommand ShowEnvironmentPickerCommand { get; }

        public async Task InitAsync()
        {
            Email = await _stateService.GetRememberedEmailAsync();
            RememberEmail = !string.IsNullOrEmpty(Email);
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag, forceRefresh: true);
        }

        public async Task ContinueToLoginStepAsync()
@@ -162,59 +144,5 @@ namespace Bit.App.Pages
                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage, AppResources.AnErrorHasOccurred, AppResources.Ok);
            }
        }
-
-        public async Task ShowEnvironmentPickerAsync()
-        {
-            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
-            var options = _displayEuEnvironment
-                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
-                    : new string[] { AppResources.US, AppResources.SelfHosted };
-
-            await Device.InvokeOnMainThreadAsync(async () =>
-            {
-                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);
-
-                if (result is null || result == AppResources.Cancel)
-                {
-                    return;
-                }
-
-                if (result == AppResources.SelfHosted)
-                {
-                    StartEnvironmentAction?.Invoke();
-                    return;
-                }
-
-                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = result;
-            });
-        }
-
-        public async Task UpdateEnvironment()
-        {
-            var environmentsSaved = await _stateService.GetPreAuthEnvironmentUrlsAsync();
-            if (environmentsSaved == null || environmentsSaved.IsEmpty)
-            {
-                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
-                environmentsSaved = EnvironmentUrlData.DefaultUS;
-                SelectedEnvironmentName = AppResources.US;
-                return;
-            }
-
-            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
-            {
-                SelectedEnvironmentName = AppResources.US;
-            }
-            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
-            {
-                SelectedEnvironmentName = AppResources.EU;
-            }
-            else
-            {
-                await _configService.GetAsync(true);
-                SelectedEnvironmentName = AppResources.SelfHosted;
-            }
-        }
    }
 }
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -137,7 +137,7 @@
                    </StackLayout>
                    <StackLayout Padding="10, 0">
                        <Label
-                            Text="{u:I18n AccountBiometricInvalidated}"
+                            Text="{u:I18n BiometricInvalidated}"
                            StyleClass="box-footer-label,text-danger,text-bold"
                            IsVisible="{Binding BiometricIntegrityValid, Converter={StaticResource inverseBool}}" />
                        <Button Text="{Binding BiometricButtonText}" Clicked="Biometric_Clicked"
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -31,8 +31,6 @@ namespace Bit.App.Pages
        private readonly ILogger _logger;
        private readonly IWatchDeviceService _watchDeviceService;
        private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
-        private readonly IPolicyService _policyService;
-        private readonly IPasswordGenerationService _passwordGenerationService;

        private string _email;
        private string _masterPassword;
@@ -63,8 +61,6 @@ namespace Bit.App.Pages
            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
-            _policyService = ServiceContainer.Resolve<IPolicyService>();
-            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -209,7 +205,7 @@ namespace Bit.App.Pages

            if (BiometricLock)
            {
-                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
+                BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
                if (!_biometricIntegrityValid)
                {
                    BiometricButtonVisible = false;
@@ -298,7 +294,6 @@ namespace Bit.App.Pages
                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
                var passwordValid = false;
-                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
@@ -310,11 +305,9 @@ namespace Bit.App.Pages
                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;
-
                    try
                    {
-                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
+                        await _apiService.PostAccountVerifyPasswordAsync(request);
                        passwordValid = true;
                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
                        await _cryptoService.SetKeyHashAsync(localKeyHash);
@@ -335,14 +328,6 @@ namespace Bit.App.Pages
                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig);
                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
                    }
-
-                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
-                    {
-                        // Save the ForcePasswordResetReason to force a password reset after unlock
-                        await _stateService.SetForcePasswordResetReasonAsync(
-                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                    }
-
                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                    await SetKeyAndContinueAsync(key);
@@ -367,37 +352,6 @@ namespace Bit.App.Pages
            }
        }

-        /// <summary>
-        /// Checks if the master password requires updating to meet the enforced policy requirements
-        /// </summary>
-        /// <param name="options"></param>
-        private async Task<bool> RequirePasswordChangeAsync(MasterPasswordPolicyOptions options = null)
-        {
-            // If no policy options are provided, attempt to load them from the policy service
-            var enforcedOptions = options ?? await _policyService.GetMasterPasswordPolicyOptions();
-
-            // No policy to enforce on login/unlock
-            if (!(enforcedOptions is { EnforceOnLogin: true }))
-            {
-                return false;
-            }
-
-            var strength = _passwordGenerationService.PasswordStrength(
-                MasterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(_email))?.Score;
-
-            if (!strength.HasValue)
-            {
-                _logger.Error("Unable to evaluate master password strength during unlock");
-                return false;
-            }
-
-            return !await _policyService.EvaluateMasterPassword(
-                strength.Value,
-                MasterPassword,
-                enforcedOptions
-            );
-        }
-
        public async Task LogOutAsync()
        {
            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LogoutConfirmation,
@@ -431,8 +385,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAsync()
        {
-            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-            BiometricButtonVisible = BiometricIntegrityValid;
+            BiometricIntegrityValid = await _biometricService.ValidateIntegrityAsync();
            if (!BiometricLock || !BiometricIntegrityValid)
            {
                return;
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -41,7 +41,6 @@ namespace Bit.App.Pages
        private bool _isEmailEnabled;
        private bool _isKnownDevice;
        private bool _isExecutingLogin;
-        private string _environmentHostName;

        public LoginPageViewModel()
        {
@@ -116,16 +115,6 @@ namespace Bit.App.Pages
            set => SetProperty(ref _isKnownDevice, value);
        }

-        public string EnvironmentDomainName
-        {
-            get => _environmentHostName;
-            set => SetProperty(ref _environmentHostName, value,
-                additionalPropertyNames: new string[]
-                {
-                    nameof(LoggingInAsText)
-                });
-        }
-
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
        public Command LogInCommand { get; }
        public Command TogglePasswordCommand { get; }
@@ -133,7 +122,7 @@ namespace Bit.App.Pages
        public ICommand LogInWithDeviceCommand { get; }
        public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
-        public string LoggingInAsText => string.Format(AppResources.LoggingInAsXOnY, Email, EnvironmentDomainName);
+        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
        public bool IsIosExtension { get; set; }
        public bool CanRemoveAccount { get; set; }
        public Action StartTwoFactorAction { get; set; }
@@ -162,7 +151,6 @@ namespace Bit.App.Pages
                    Email = await _stateService.GetRememberedEmailAsync();
                }
                CanRemoveAccount = await _stateService.GetActiveUserEmailAsync() != Email;
-                EnvironmentDomainName = CoreHelpers.GetDomain((await _stateService.GetPreAuthEnvironmentUrlsAsync())?.Base);
                IsKnownDevice = await _apiService.GetKnownDeviceAsync(Email, await _appIdService.GetAppIdAsync());
            }
            catch (ApiException apiEx) when (apiEx.Error.StatusCode == System.Net.HttpStatusCode.Unauthorized)
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -121,8 +121,9 @@ namespace Bit.App.Pages

                var ssoToken = response.Token;

-                var passwordOptions = PasswordGenerationOptions.CreateDefault
-                                                               .WithLength(64);
+
+                var passwordOptions = new PasswordGenerationOptions(true);
+                passwordOptions.Length = 64;

                var codeVerifier = await _passwordGenerationService.GeneratePasswordAsync(passwordOptions);
                var codeVerifierHash = await _cryptoFunctionService.HashAsync(codeVerifier, CryptoHashAlgorithm.Sha256);
--- a/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
@@ -46,7 +46,7 @@
                           BackgroundColor="Transparent"
                           BorderColor="{DynamicResource PrimaryColor}">
                        <Label
-                            Text="{Binding UpdateMasterPasswordWarningText }"
+                            Text="{u:I18n UpdateMasterPasswordWarning}"
                            StyleClass="text-muted, text-sm, text-bold"
                            HorizontalTextAlignment="Center" />
                    </Frame>
@@ -74,40 +74,6 @@
                            HorizontalTextAlignment="Start" />
                    </Frame>
                </Grid>
-                <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Label
-                        Text="{u:I18n CurrentMasterPassword}"
-                        StyleClass="box-label" 
-                        Grid.Row="0"
-                        Grid.Column="0" />
-                    <controls:MonoEntry
-                        x:Name="_currentMasterPassword"
-                        Text="{Binding CurrentMasterPassword}"
-                        StyleClass="box-value"
-                        IsSpellCheckEnabled="False"
-                        IsTextPredictionEnabled="False"
-                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
-                        Grid.Row="1"
-                        Grid.Column="0" />
-                    <controls:IconButton
-                        StyleClass="box-row-button, box-row-button-platform"
-                        Text="{Binding ShowPasswordIcon}"
-                        Command="{Binding TogglePasswordCommand}"
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
-                </Grid>
                <Grid StyleClass="box-row">
                    <Grid.RowDefinitions>
                        <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -1,68 +1,27 @@
 using System;
 using System.Threading.Tasks;
 using Bit.App.Resources;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;

 namespace Bit.App.Pages
 {
    public class UpdateTempPasswordPageViewModel : BaseChangePasswordViewModel
    {
-        private readonly IUserVerificationService _userVerificationService;
-
-        private ForcePasswordResetReason _reason = ForcePasswordResetReason.AdminForcePasswordReset;
-
        public UpdateTempPasswordPageViewModel()
        {
            PageTitle = AppResources.UpdateMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
            ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
-            SubmitCommand = new AsyncCommand(SubmitAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
+            SubmitCommand = new Command(async () => await SubmitAsync());
        }

-        public AsyncCommand SubmitCommand { get; }
+        public Command SubmitCommand { get; }
        public Command TogglePasswordCommand { get; }
        public Command ToggleConfirmPasswordCommand { get; }
        public Action UpdateTempPasswordSuccessAction { get; set; }
        public Action LogOutAction { get; set; }
-        public string CurrentMasterPassword { get; set; }
-
-        public override async Task InitAsync(bool forceSync = false)
-        {
-            await base.InitAsync(forceSync);
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _reason = forcePasswordResetReason.Value;
-            }
-        }
-
-        public bool RequireCurrentPassword
-        {
-            get => _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin;
-        }
-
-        public string UpdateMasterPasswordWarningText
-        {
-            get
-            {
-                return _reason == ForcePasswordResetReason.WeakMasterPasswordOnLogin
-                    ? AppResources.UpdateWeakMasterPasswordWarning
-                    : AppResources.UpdateMasterPasswordWarning;
-            }
-        }

        public void TogglePassword()
        {
@@ -83,12 +42,6 @@ namespace Bit.App.Pages
                return;
            }

-            if (RequireCurrentPassword &&
-                !await _userVerificationService.VerifyUser(CurrentMasterPassword, VerificationType.MasterPassword))
-            {
-                return;
-            }
-
            // Retrieve details for key generation
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
            var email = await _stateService.GetEmailAsync();
@@ -100,29 +53,21 @@ namespace Bit.App.Pages
            // Create new encKey for the User
            var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);

+            // Create request
+            var request = new UpdateTempPasswordRequest
+            {
+                Key = newEncKey.Item2.EncryptedString,
+                NewMasterPasswordHash = masterPasswordHash,
+                MasterPasswordHint = Hint
+            };
+
            // Initiate API action
            try
            {
                await _deviceActionService.ShowLoadingAsync(AppResources.UpdatingPassword);
-
-                switch (_reason)
-                {
-                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
+                await _apiService.PutUpdateTempPasswordAsync(request);
                await _deviceActionService.HideLoadingAsync();

-                // Clear the force reset password reason
-                await _stateService.SetForcePasswordResetReasonAsync(null);
-
-                _platformUtilsService.ShowToast(null, null, AppResources.UpdatedMasterPassword);
-
                UpdateTempPasswordSuccessAction?.Invoke();
            }
            catch (ApiException e)
@@ -140,32 +85,5 @@ namespace Bit.App.Pages
                }
            }
        }
-
-        private async Task UpdateTempPasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var request = new UpdateTempPasswordRequest
-            {
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PutUpdateTempPasswordAsync(request);
-        }
-
-        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
-        {
-            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);
-
-            var request = new PasswordRequest
-            {
-                MasterPasswordHash = currentPasswordHash,
-                Key = newEncKey,
-                NewMasterPasswordHash = newMasterPasswordHash,
-                MasterPasswordHint = Hint
-            };
-
-            await _apiService.PostPasswordAsync(request);
-        }
    }
 }
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -827,7 +827,7 @@ namespace Bit.App.Pages
        private void SetOptions()
        {
            _options.AllowAmbiguousChar = AllowAmbiguousChars;
-            _options.Type = PasswordTypeSelectedIndex == 1 ? PasswordGenerationOptions.TYPE_PASSPHRASE : PasswordGenerationOptions.TYPE_PASSWORD;
+            _options.Type = PasswordTypeSelectedIndex == 1 ? "passphrase" : "password";
            _options.MinNumber = MinNumber;
            _options.MinSpecial = MinSpecial;
            _options.Special = Special;
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -7,7 +7,10 @@ using Bit.App.Pages.Accounts;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Models.Domain;
+using Bit.Core.Models.Response;
+using Bit.Core.Models.View;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -48,7 +51,7 @@ namespace Bit.App.Pages
        private bool _reportLoggingEnabled;
        private bool _approvePasswordlessLoginRequests;
        private bool _shouldConnectToWatch;
-        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
+        private List<KeyValuePair<string, int?>> _vaultTimeouts =
            new List<KeyValuePair<string, int?>>
            {
                new KeyValuePair<string, int?>(AppResources.Immediately, 0),
@@ -62,7 +65,7 @@ namespace Bit.App.Pages
                new KeyValuePair<string, int?>(AppResources.Never, null),
                new KeyValuePair<string, int?>(AppResources.Custom, CustomVaultTimeoutValue),
            };
-        private readonly static List<KeyValuePair<string, VaultTimeoutAction>> VaultTimeoutActionOptions =
+        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActions =
            new List<KeyValuePair<string, VaultTimeoutAction>>
            {
                new KeyValuePair<string, VaultTimeoutAction>(AppResources.Lock, VaultTimeoutAction.Lock),
@@ -71,8 +74,6 @@ namespace Bit.App.Pages

        private Policy _vaultTimeoutPolicy;
        private int? _vaultTimeout;
-        private List<KeyValuePair<string, int?>> _vaultTimeoutOptions = VaultTimeoutOptions;
-        private List<KeyValuePair<string, VaultTimeoutAction>> _vaultTimeoutActionOptions = VaultTimeoutActionOptions;

        public SettingsPageViewModel()
        {
@@ -116,28 +117,20 @@ namespace Bit.App.Pages
                    _localizeService.GetLocaleShortTime(lastSync.Value));
            }

-            _vaultTimeoutPolicy = null;
-            _vaultTimeoutOptions = VaultTimeoutOptions;
-            _vaultTimeoutActionOptions = VaultTimeoutActionOptions;
-
-            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
-            _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
-            _vaultTimeoutDisplayValue ??= _vaultTimeoutOptions.Where(o => o.Value == CustomVaultTimeoutValue).First().Key;
-
-            var action = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
-            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == action).Key;
-
            if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
            {
-                // if we have a vault timeout policy, we need to filter the timeout options
                _vaultTimeoutPolicy = (await _policyService.GetAll(PolicyType.MaximumVaultTimeout)).First();
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                _vaultTimeoutOptions = _vaultTimeoutOptions.Where(t =>
-                    t.Value <= policyMinutes &&
+                var minutes = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                _vaultTimeouts = _vaultTimeouts.Where(t =>
+                    t.Value <= minutes &&
                    (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
                    t.Value != null).ToList();
            }

+            _vaultTimeout = await _vaultTimeoutService.GetVaultTimeout();
+            _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == _vaultTimeout).Key;
+            var action = await _stateService.GetVaultTimeoutActionAsync() ?? VaultTimeoutAction.Lock;
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActions.FirstOrDefault(o => o.Value == action).Key;
            var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
            _pin = pinSet.Item1 || pinSet.Item2;
            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
@@ -273,7 +266,7 @@ namespace Bit.App.Pages
        {
            var oldTimeout = _vaultTimeout;

-            var options = _vaultTimeoutOptions.Select(
+            var options = _vaultTimeouts.Select(
                o => o.Key == _vaultTimeoutDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
            if (promptOptions)
            {
@@ -284,7 +277,7 @@ namespace Bit.App.Pages
                    return;
                }
                var cleanSelection = selection.Replace("✓ ", string.Empty);
-                var selectionOption = _vaultTimeoutOptions.FirstOrDefault(o => o.Key == cleanSelection);
+                var selectionOption = _vaultTimeouts.FirstOrDefault(o => o.Key == cleanSelection);

                // Check if the selected Timeout action is "Never" and if it's different from the previous selected value
                if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
@@ -302,13 +295,13 @@ namespace Bit.App.Pages

            if (_vaultTimeoutPolicy != null)
            {
-                var maximumTimeout = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes");

                if (newTimeout > maximumTimeout)
                {
                    await _platformUtilsService.ShowDialogAsync(AppResources.VaultTimeoutToLarge, AppResources.Warning);
                    var timeout = await _vaultTimeoutService.GetVaultTimeout();
-                    _vaultTimeoutDisplayValue = _vaultTimeoutOptions.FirstOrDefault(o => o.Value == timeout).Key ??
+                    _vaultTimeoutDisplayValue = _vaultTimeouts.FirstOrDefault(o => o.Value == timeout).Key ??
                                                AppResources.Custom;
                    return;
                }
@@ -381,13 +374,7 @@ namespace Bit.App.Pages

        public async Task VaultTimeoutActionAsync()
        {
-            if (_vaultTimeoutPolicy != null &&
-                !string.IsNullOrEmpty(_vaultTimeoutPolicy.GetString(Policy.ACTION_KEY)))
-            {
-                // do nothing if we have a policy set
-                return;
-            }
-            var options = _vaultTimeoutActionOptions.Select(o =>
+            var options = _vaultTimeoutActions.Select(o =>
                o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
                AppResources.Cancel, null, options);
@@ -406,7 +393,7 @@ namespace Bit.App.Pages
                    cleanSelection = AppResources.Lock;
                }
            }
-            var selectionOption = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == cleanSelection);
+            var selectionOption = _vaultTimeoutActions.FirstOrDefault(o => o.Key == cleanSelection);
            var changed = _vaultTimeoutActionDisplayValue != selectionOption.Key;
            _vaultTimeoutActionDisplayValue = selectionOption.Key;
            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout,
@@ -610,36 +597,14 @@ namespace Bit.App.Pages
            }
            if (_vaultTimeoutPolicy != null)
            {
-                var policyMinutes = _vaultTimeoutPolicy.GetInt(Policy.MINUTES_KEY);
-                var policyAction = _vaultTimeoutPolicy.GetString(Policy.ACTION_KEY);
-
-                if (policyMinutes.HasValue || !string.IsNullOrWhiteSpace(policyAction))
+                var maximumTimeout = _policyService.GetPolicyInt(_vaultTimeoutPolicy, "minutes").GetValueOrDefault();
+                securityItems.Insert(0, new SettingsPageListItem
                {
-                    string policyAlert;
-                    if (policyMinutes.HasValue && string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60);
-                    }
-                    else if (!policyMinutes.HasValue && !string.IsNullOrWhiteSpace(policyAction))
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutActionPolicyInEffect,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    else
-                    {
-                        policyAlert = string.Format(AppResources.VaultTimeoutPolicyWithActionInEffect,
-                            Math.Floor((float)policyMinutes / 60),
-                            policyMinutes % 60,
-                            policyAction == Policy.ACTION_LOCK ? AppResources.Lock : AppResources.LogOut);
-                    }
-                    securityItems.Insert(0, new SettingsPageListItem
-                    {
-                        Name = policyAlert,
-                        UseFrame = true,
-                    });
-                }
+                    Name = string.Format(AppResources.VaultTimeoutPolicyInEffect,
+                        Math.Floor((float)maximumTimeout / 60),
+                        maximumTimeout % 60),
+                    UseFrame = true,
+                });
            }
            if (Device.RuntimePlatform == Device.Android)
            {
@@ -827,12 +792,12 @@ namespace Bit.App.Pages

        private VaultTimeoutAction GetVaultTimeoutActionFromKey(string key)
        {
-            return _vaultTimeoutActionOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeoutActions.FirstOrDefault(o => o.Key == key).Value;
        }

        private int? GetVaultTimeoutFromKey(string key)
        {
-            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
+            return _vaultTimeouts.FirstOrDefault(o => o.Key == key).Value;
        }

        private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using Bit.App.Effects;
 using Bit.App.Models;
 using Bit.App.Resources;
-using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
@@ -16,7 +15,6 @@ namespace Bit.App.Pages
        private readonly IBroadcasterService _broadcasterService;
        private readonly IMessagingService _messagingService;
        private readonly IKeyConnectorService _keyConnectorService;
-        private readonly IStateService _stateService;
        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");

        private NavigationPage _groupingsPage;
@@ -28,7 +26,6 @@ namespace Bit.App.Pages
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _stateService = ServiceContainer.Resolve<IStateService>();

            _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
            {
@@ -98,13 +95,6 @@ namespace Bit.App.Pages
            {
                _messagingService.Send("convertAccountToKeyConnector");
            }
-
-            var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync();
-
-            if (forcePasswordResetReason.HasValue)
-            {
-                _messagingService.Send(Constants.ForceUpdatePassword);
-            }
        }

        protected override void OnDisappearing()
--- a/src/App/Pages/Vault/AttachmentsPageViewModel.cs
+++ b/src/App/Pages/Vault/AttachmentsPageViewModel.cs
@@ -123,7 +123,7 @@ namespace Bit.App.Pages
            {
                await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
                _cipherDomain = await _cipherService.SaveAttachmentRawWithServerAsync(
-                    _cipherDomain, Cipher, FileName, FileData);
+                    _cipherDomain, FileName, FileData);
                Cipher = await _cipherDomain.DecryptAsync();
                await _deviceActionService.HideLoadingAsync();
                _platformUtilsService.ShowToast("success", null, AppResources.AttachementAdded);
@@ -156,7 +156,7 @@ namespace Bit.App.Pages
            // Prevent Android from locking if vault timeout set to "immediate"
            if (Device.RuntimePlatform == Device.Android)
            {
-                _vaultTimeoutService.DelayTimeoutMs = 60000;
+                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
            }
            await _fileService.SelectFileAsync();
        }
--- a/src/App/Pages/Vault/CipherSelectionPage.xaml
+++ b/src/App/Pages/Vault/CipherSelectionPage.xaml
@@ -16,7 +16,7 @@
            IconImageSource="{Binding AvatarImageSource}"
            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
            Order="Primary"
-            Priority="-1"
+            Priority="-2"
            UseOriginalImage="True"
            AutomationProperties.IsInAccessibleTree="True"
            AutomationProperties.Name="{u:I18n Account}" />
--- a/src/App/Pages/Vault/CipherSelectionPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherSelectionPage.xaml.cs
@@ -69,16 +69,14 @@ namespace Bit.App.Pages
                return;
            }

-            try
+            // TODO: There's currently an issue on iOS where the toolbar item is not getting updated
+            // as the others somehow. Removing this so at least we get the circle with ".." instead
+            // of a white circle
+            if (Device.RuntimePlatform != Device.iOS)
            {
-                // don't crash the app if the avatar can't be loaded, just log the ex
                _accountAvatar?.OnAppearing();
                _vm.AvatarImageSource = await GetAvatarImageSourceAsync();
            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-            }

            _broadcasterService.Subscribe(nameof(CipherSelectionPage), async (message) =>
            {
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -970,18 +970,18 @@ namespace Bit.App.Resources {
        /// <summary>
        ///   Looks up a localized string similar to Biometric unlock disabled pending verification of master password..
        /// </summary>
-        public static string AccountBiometricInvalidated {
+        public static string BiometricInvalidated {
            get {
-                return ResourceManager.GetString("AccountBiometricInvalidated", resourceCulture);
+                return ResourceManager.GetString("BiometricInvalidated", resourceCulture);
            }
        }
        
        /// <summary>
        ///   Looks up a localized string similar to Biometric unlock for autofill disabled pending verification of master password..
        /// </summary>
-        public static string AccountBiometricInvalidatedExtension {
+        public static string BiometricInvalidatedExtension {
            get {
-                return ResourceManager.GetString("AccountBiometricInvalidatedExtension", resourceCulture);
+                return ResourceManager.GetString("BiometricInvalidatedExtension", resourceCulture);
            }
        }
        
@@ -1687,15 +1687,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Current master password.
-        /// </summary>
-        public static string CurrentMasterPassword {
-            get {
-                return ResourceManager.GetString("CurrentMasterPassword", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Custom.
        /// </summary>
@@ -1750,15 +1741,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Data region.
-        /// </summary>
-        public static string DataRegion {
-            get {
-                return ResourceManager.GetString("DataRegion", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Password updated.
        /// </summary>
@@ -2335,15 +2317,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to EU.
-        /// </summary>
-        public static string EU {
-            get {
-                return ResourceManager.GetString("EU", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Exact.
        /// </summary>
@@ -3587,11 +3560,11 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Logging in as {0} on {1}.
+        ///   Looks up a localized string similar to Logging in as {0}.
        /// </summary>
-        public static string LoggingInAsXOnY {
+        public static string LoggingInAsX {
            get {
-                return ResourceManager.GetString("LoggingInAsXOnY", resourceCulture);
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
            }
        }
        
@@ -5147,15 +5120,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Region.
-        /// </summary>
-        public static string Region {
-            get {
-                return ResourceManager.GetString("Region", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Remember me.
        /// </summary>
@@ -5489,15 +5453,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Self-hosted.
-        /// </summary>
-        public static string SelfHosted {
-            get {
-                return ResourceManager.GetString("SelfHosted", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Self-hosted environment.
        /// </summary>
@@ -6497,15 +6452,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour..
-        /// </summary>
-        public static string UpdateWeakMasterPasswordWarning {
-            get {
-                return ResourceManager.GetString("UpdateWeakMasterPasswordWarning", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Updating password.
        /// </summary>
@@ -6560,15 +6506,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to US.
-        /// </summary>
-        public static string US {
-            get {
-                return ResourceManager.GetString("US", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Use another two-step login method.
        /// </summary>
@@ -6740,15 +6677,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your vault timeout action to {0}..
-        /// </summary>
-        public static string VaultTimeoutActionPolicyInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutActionPolicyInEffect", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?.
        /// </summary>
@@ -6759,7 +6687,7 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s)..
+        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s).
        /// </summary>
        public static string VaultTimeoutPolicyInEffect {
            get {
@@ -6767,15 +6695,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}..
-        /// </summary>
-        public static string VaultTimeoutPolicyWithActionInEffect {
-            get {
-                return ResourceManager.GetString("VaultTimeoutPolicyWithActionInEffect", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Your vault timeout exceeds the restrictions set by your organization..
        /// </summary>
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -1752,11 +1752,11 @@ Skandering gebeur outomaties.</value>
    <value>Wil u dit regtig na die asblik stuur?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometriese ontgrendeling gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometriese ontgrendeling vir outovul gedeaktiveer hangende bevestiging van hoofwagwoord.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Aktiveer sinchronisering by verfrissing</value>
@@ -2142,12 +2142,6 @@ Skandering gebeur outomaties.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>U organisasiebeleide beïnvloed u kluisuitelling. Maksimum toegelate kluisuittelling is {0} uur en {1} minuut(e).</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid affekteer jou kluis-uittel tyd. Maksimum toelaatbare kluis-uittel tyd is {0} uur(ure) en {1} minuut(minute). Jou kluis-uittel aksie is gestel na {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Jou organisasie se beleid het jou kluis-uittel aksie na {0} verander.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>U kluisuittelling oorskry die beperkinge wat deur u organisasie daargestel is.</value>
  </data>
@@ -2495,8 +2489,8 @@ Wil u na die rekening omskakel?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Kry hoofwagwoord wenk</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Teken in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nie jy nie?</value>
@@ -2598,36 +2592,15 @@ Wil u na die rekening omskakel?</value>
    <value>Organisasie SSO identifiseerder vereis.</value>
  </data>
  <data name="AddTheKeyToAnExistingOrNewItem" xml:space="preserve">
-    <value>Voeg die sleutel by 'n huidige of nuwe item</value>
+    <value>Add the key to an existing or new item</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>Daar is geen items in jou kluis wat met "{0}" ooreenstem nie</value>
+    <value>There are no items in your vault that match "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Soek vir 'n item of voeg 'n nuwe een by</value>
+    <value>Search for an item or add a new item</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Daar is geen items wat met die soekterm ooreenstem nie</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
+    <value>There are no items that match the search</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.ar.resx
+++ b/src/App/Resources/AppResources.ar.resx
@@ -1752,11 +1752,11 @@
    <value>هل تريد حقاً أن ترسل إلى سلة المهملات؟</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>تم تعطيل فتح القفل الحيوي في انتظار التحقق من كلمة المرور الرئيسية.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>تم تعطيل إلغاء القفل البيومتري للملء التلقائي في انتظار التحقق من كلمة المرور الرئيسية.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>تمكين المزامنة عند التحديث</value>
@@ -2143,12 +2143,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>سياسات مؤسستك تؤثر على مهلة الخزنة الخاص بك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة و {1} دقيقة</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك تؤثر على مهلة خزنتك. الحد الأقصى المسموح به لمهلة الخزنة هو {0} ساعة(ساعات) و {1} دقيقة(دقائق). يتم تعيين إجراء مهلة المخزن الخاص بك إلى {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>سياسات مؤسستك قامت بتعيين إجراء مهلة خزنتك إلى {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>مهلة خزنتك تتجاوز القيود التي تضعها مؤسستك.</value>
  </data>
@@ -2496,8 +2490,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>احصل على تلميح كلمة المرور الرئيسية</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>ليس أنت؟</value>
@@ -2610,25 +2604,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>لا توجد عناصر تطابق البحث</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الخاصة بك لا تفي بواحدة أو أكثر من سياسات مؤسستك. من أجل الوصول إلى الخزنة، يجب عليك تحديث كلمة المرور الرئيسية الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>كلمة المرور الرئيسية الحالية</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -1752,11 +1752,11 @@ Skan prosesi avtomatik baş tutacaq.</value>
    <value>Həqiqətən tullantı qutusuna göndərmək istəyirsiniz?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün biometrik kilid açma sıradan çıxarıldı.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün bu hesab üzrə avto-doldurma biometrik kilid açma sıradan çıxarıldı.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Ana parolun təsdiqlənməsi gözlənildiyi üçün avto-doldurma üzrə biometrik kilid açma sıradan çıxarıldı.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Təzələmə əsnasında eyniləşdirməni fəallaşdır</value>
@@ -2142,12 +2142,6 @@ Skan prosesi avtomatik baş tutacaq.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt {0} saat {1} dəqiqədir. Anbar vaxt bitişi əməliyyatı {2} olaraq tənzimləndi.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Təşkilatınızın siyasətləri, anbar vaxt bitişi əməliyyatınızı {0} olaraq tənzimlədi.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Anbar vaxt bitişi, təşkilatınız tərəfindən tənzimlənən məhdudiyyətləri aşır.</value>
  </data>
@@ -2494,8 +2488,8 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Ana parol üçün məsləhət alın</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzərində {0} olaraq giriş edildi</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Siz deyilsiniz?</value>
@@ -2608,25 +2602,4 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Axtarışa uyğun gələn heç bir element yoxdur</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>ABŞ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Öz-özünə sahiblik edən</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data bölgəsi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölgə</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Anbara müraciət üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Hazırkı ana parol</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.be.resx
+++ b/src/App/Resources/AppResources.be.resx
@@ -1751,11 +1751,11 @@
    <value>Вы сапраўды хочаце адправіць элемент у сметніцу?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Разблакіроўка па біяметрыі для гэтага ўліковага запісу адключана. Чакаецца праверка асноўным паролем.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Разблакіраванне па біяметрыі адключана. Чакаецца праверка асноўным паролем.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Аўтазапаўненне з дапамогай разблакіроўкі па біяметрыі для гэтага ўліковага запісу адключана. Чакаецца праверка асноўным паролем.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Разблакіраванне па біяметрыі для аўтазапаўнення адключана. Чакаецца праверка асноўным паролем.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Уключыць сінхранізацыю пры абнаўленні</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Палітыка вашай арганізацыі ўплывае на час чакання сховішча. Максімальны дазволены час чакання сховішча складае {0} гадз. і {1} хв.</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Палітыка вашай арганізацыі ўплывае на час чакання сховішча. Максімальны дазволены час чакання сховішча складае гадзін: {0}; хвілін: {1}. Для часу чакання вашага сховішча прызначана дзеянне {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Палітыкай вашай арганізацыі прызначана дзеянне {0} для часу чакання вашага сховішча.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Час чакання вашага сховішча перавышае дазволеныя абмежаванні, якія прызначыла ваша арганізацыя.</value>
  </data>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Атрымаць падказку да асноўнага пароля</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Увайсці як {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Не вы?</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Адсутнічаюць элементы, якія адпавядаюць пошуку</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ваш асноўны пароль не адпавядае адной або некалькім палітыкам арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Актыўныя сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Бягучы асноўны пароль</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.bg.resx
+++ b/src/App/Resources/AppResources.bg.resx
@@ -1752,11 +1752,11 @@
    <value>Сигурни ли сте, че искате да преместите записа в кошчето?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Потвърждаването с биометрични данни е изключено за тази регистрация. Въведете главната парола, за да го включите.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Засечена е промяна в биометричните данни. Впишете се с главната парола, за да я включите отново биометричната идентификация.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Автоматичното попълване за потвърждаване с биометрични данни е изключено за тази регистрация. Въведете главната парола, за да го включите.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Потвърждаването с биометрични данни е изключено. Въведете главната парола, за да го включите.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Синхронизация при опресняване</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е {0} час(а) и {1} минути</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е {0} час(а) и {1} минута/и. Зададеното действие при изтичане на това време е {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Настройките на организацията Ви задават следното действие при изтичане на времето за достъп до трезора: {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Времето за достъп до трезора Ви превишава ограничението, определено от организацията Ви.</value>
  </data>
@@ -2495,8 +2489,8 @@ select Add TOTP to store the key safely</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Получете подсказване за главната парола</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Влизате като {0} в {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вписване като {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Това не сте Вие?</value>
@@ -2609,25 +2603,4 @@ select Add TOTP to store the key safely</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Няма елементи, които отговарят на търсенето</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>САЩ</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЕС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Собствен хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион на данните</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Вашата главна парола не отговаря на една или повече политики на организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Текуща главна парола</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.bn.resx
+++ b/src/App/Resources/AppResources.bn.resx
@@ -160,7 +160,7 @@
    <comment>The button text that allows a user to copy the login's username to their clipboard.</comment>
  </data>
  <data name="Credits" xml:space="preserve">
-    <value>কৃতিত্ব</value>
+    <value>Credits</value>
    <comment>Title for page that we use to give credit to resources that we use.</comment>
  </data>
  <data name="Delete" xml:space="preserve">
@@ -168,11 +168,11 @@
    <comment>Delete an entity (verb).</comment>
  </data>
  <data name="Deleting" xml:space="preserve">
-    <value>মোছা হচ্ছে...</value>
+    <value>Deleting...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>আপনি কি সত্যিই মুছে ফেলতে চান? এটিকে পূর্বের মত করা যাবে না।.</value>
+    <value>Do you really want to delete? This cannot be undone.</value>
    <comment>Confirmation alert message when deleteing something.</comment>
  </data>
  <data name="Edit" xml:space="preserve">
@@ -190,16 +190,16 @@
    <comment>Full label for a email address.</comment>
  </data>
  <data name="EmailUs" xml:space="preserve">
-    <value>আমাদের ইমেইল করুন</value>
+    <value>Email us</value>
  </data>
  <data name="EmailUsDescription" xml:space="preserve">
-    <value>সাহায্য পেতে বা মতামত দিতে সরাসরি আমাদের ইমেল করুন।</value>
+    <value>Email us directly to get help or leave feedback.</value>
  </data>
  <data name="EnterPIN" xml:space="preserve">
-    <value>আপনার পিন কোডটি প্রবেশ করান</value>
+    <value>Enter your PIN code.</value>
  </data>
  <data name="Favorites" xml:space="preserve">
-    <value>পছন্দসমূহ</value>
+    <value>Favorites</value>
    <comment>Title for your favorite items in the vault.</comment>
  </data>
  <data name="FileBugReport" xml:space="preserve">
@@ -216,7 +216,7 @@
    <comment>Label for a folder.</comment>
  </data>
  <data name="FolderCreated" xml:space="preserve">
-    <value>নতুন ফোল্ডার তৈরি হয়েছে।</value>
+    <value>New folder created.</value>
  </data>
  <data name="FolderDeleted" xml:space="preserve">
    <value>Folder deleted.</value>
@@ -276,7 +276,7 @@
    <value>আপনি লগ আউট করতে চান?</value>
  </data>
  <data name="RemoveAccount" xml:space="preserve">
-    <value>অ্যাকাউন্ট অপসারণ করুন</value>
+    <value>Remove account</value>
  </data>
  <data name="RemoveAccountConfirmation" xml:space="preserve">
    <value>Are you sure you want to remove this account?</value>
@@ -315,30 +315,30 @@
    <comment>Label for notes.</comment>
  </data>
  <data name="Ok" xml:space="preserve">
-    <value>ঠিক আছে</value>
+    <value>Ok</value>
    <comment>Acknowledgement.</comment>
  </data>
  <data name="Password" xml:space="preserve">
-    <value>পাসওয়ার্ড</value>
+    <value>Password</value>
    <comment>Label for a password.</comment>
  </data>
  <data name="Save" xml:space="preserve">
-    <value>সংরক্ষণ করুন</value>
+    <value>Save</value>
    <comment>Button text for a save operation (verb).</comment>
  </data>
  <data name="Move" xml:space="preserve">
-    <value>স্থানান্তর করুন</value>
+    <value>Move</value>
  </data>
  <data name="Saving" xml:space="preserve">
    <value>Saving...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Settings" xml:space="preserve">
-    <value>সেটিংস</value>
+    <value>Settings</value>
    <comment>The title for the settings page.</comment>
  </data>
  <data name="Show" xml:space="preserve">
-    <value>দেখান</value>
+    <value>Show</value>
    <comment>Reveal a hidden value (password).</comment>
  </data>
  <data name="ItemDeleted" xml:space="preserve">
@@ -346,17 +346,17 @@
    <comment>Confirmation message after successfully deleting a login.</comment>
  </data>
  <data name="Submit" xml:space="preserve">
-    <value>জমা দিন</value>
+    <value>Submit</value>
  </data>
  <data name="Sync" xml:space="preserve">
    <value>Sync</value>
    <comment>The title for the sync page.</comment>
  </data>
  <data name="ThankYou" xml:space="preserve">
-    <value>ধন্যবাদ</value>
+    <value>Thank you</value>
  </data>
  <data name="Tools" xml:space="preserve">
-    <value>টুলস</value>
+    <value>Tools</value>
    <comment>The title for the tools page.</comment>
  </data>
  <data name="URI" xml:space="preserve">
@@ -379,7 +379,7 @@
    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
  </data>
  <data name="VerifyFingerprint" xml:space="preserve">
-    <value>আঙ্গুলের ছাপ যাচাই করুন</value>
+    <value>Verify fingerprint</value>
  </data>
  <data name="VerifyMasterPassword" xml:space="preserve">
    <value>প্রধান পাসওয়ার্ড যাচাইকরণ</value>
@@ -388,32 +388,32 @@
    <value>Verify PIN</value>
  </data>
  <data name="Version" xml:space="preserve">
-    <value>সংস্করণ</value>
+    <value>Version</value>
  </data>
  <data name="View" xml:space="preserve">
    <value>View</value>
  </data>
  <data name="VisitOurWebsite" xml:space="preserve">
-    <value>আমাদের ওয়েবসাইটে ঢু মেরে আসুন</value>
+    <value>Visit our website</value>
  </data>
  <data name="VisitOurWebsiteDescription" xml:space="preserve">
-    <value>সাহায্য পেতে, খবর পেতে, আমাদের ইমেল করতে এবং/অথবা বিটওয়ার্ডেন কীভাবে ব্যবহার করবেন সে সম্পর্কে আরও জানতে আমাদের ওয়েবসাইট দেখুন।</value>
+    <value>Visit our website to get help, news, email us, and/or learn more about how to use Bitwarden.</value>
  </data>
  <data name="Website" xml:space="preserve">
-    <value>ওয়েবসাইট</value>
+    <value>Website</value>
    <comment>Label for a website.</comment>
  </data>
  <data name="Yes" xml:space="preserve">
-    <value>হ্যাঁ</value>
+    <value>Yes</value>
  </data>
  <data name="Account" xml:space="preserve">
-    <value>অ্যাকাউন্ট</value>
+    <value>Account</value>
  </data>
  <data name="AccountCreated" xml:space="preserve">
-    <value>আপনার নতুন অ্যাকাউন্ট তৈরি করা হয়েছে! আপনি এখন লগইন করতে পারবেন।</value>
+    <value>Your new account has been created! You may now log in.</value>
  </data>
  <data name="AddAnItem" xml:space="preserve">
-    <value>একটি আইটেম যোগ করুন</value>
+    <value>Add an Item</value>
  </data>
  <data name="AppExtension" xml:space="preserve">
    <value>App extension</value>
@@ -425,7 +425,7 @@
    <value>Auto-fill service</value>
  </data>
  <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>অস্পষ্ট বর্ণগুলি বাদ দিয়ে যান</value>
+    <value>Avoid ambiguous characters</value>
  </data>
  <data name="BitwardenAppExtension" xml:space="preserve">
    <value>Bitwarden app extension</value>
@@ -440,13 +440,13 @@
    <value>Bitwarden Auto-fill Service</value>
  </data>
  <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
-    <value>আপনার লগইনগুলি স্বয়ংক্রিয়ভাবে পূরণ করতে বিটওয়ার্ডেন অ্যাক্সেসিবিলিটি পরিষেবা ব্যবহার করুন৷</value>
+    <value>Use the Bitwarden accessibility service to auto-fill your logins.</value>
  </data>
  <data name="ChangeEmail" xml:space="preserve">
-    <value>ইমেইল পরিবর্তন করুন</value>
+    <value>Change email</value>
  </data>
  <data name="ChangeEmailConfirmation" xml:space="preserve">
-    <value>আপনি bitwarden.com ওয়েব ভল্টে আপনার ইমেল ঠিকানা পরিবর্তন করতে পারেন। আপনি কি এখনই ওয়েবসাইট ভিজিট করতে চান?</value>
+    <value>You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?</value>
  </data>
  <data name="ChangeMasterPassword" xml:space="preserve">
    <value>প্রধান পাসওয়ার্ড পরিবর্তন</value>
@@ -455,7 +455,7 @@
    <value>আপনি bitwarden.com ওয়েব ভল্ট থেকে প্রধান পাসওয়ার্ডটি পরিবর্তন করতে পারেন। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?</value>
  </data>
  <data name="Close" xml:space="preserve">
-    <value>বন্ধ করুন</value>
+    <value>Close</value>
  </data>
  <data name="Continue" xml:space="preserve">
    <value>অবিরত</value>
@@ -480,7 +480,7 @@
    <value>Reactivate app extension</value>
  </data>
  <data name="ExtensionAlmostDone" xml:space="preserve">
-    <value>প্রায় হয়ে গেছে!</value>
+    <value>Almost done!</value>
  </data>
  <data name="ExtensionEnable" xml:space="preserve">
    <value>Activate app extension</value>
@@ -493,7 +493,7 @@
    <value>Get instant access to your passwords!</value>
  </data>
  <data name="ExtensionReady" xml:space="preserve">
-    <value>আপনি লগইন করার জন্য একদম তৈরি!</value>
+    <value>You're ready to log in!</value>
  </data>
  <data name="ExtensionSetup" xml:space="preserve">
    <value>Your logins are now easily accessible from Safari, Chrome, and other supported apps.</value>
@@ -511,7 +511,7 @@
    <value>প্রিয়</value>
  </data>
  <data name="Fingerprint" xml:space="preserve">
-    <value>আঙুলের ছাপ</value>
+    <value>Fingerprint</value>
  </data>
  <data name="GeneratePassword" xml:space="preserve">
    <value>পাসওয়ার্ড তৈরি করুন</value>
@@ -584,7 +584,7 @@
    <value>যদি আপনি আপনার পাসওয়ার্ড ভুলে যান তাহলে একটি প্রধান পাসওয়ার্ডের ইঙ্গিতটি আপনাকে মনে করাতে সাহায্য করতে পারে।</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>মাস্টার পাসওয়ার্ড কমপক্ষে {0} অক্ষরের হতে হবে।</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>সর্বনিম্ন সংখ্যা</value>
@@ -595,7 +595,7 @@
    <comment>Minimum special characters for password generator settings</comment>
  </data>
  <data name="MoreSettings" xml:space="preserve">
-    <value>আরও সেটিংস</value>
+    <value>More settings</value>
  </data>
  <data name="MustLogInMainApp" xml:space="preserve">
    <value>You must log into the main Bitwarden app before you can use the extension.</value>
@@ -651,7 +651,7 @@
    <comment>Push notifications for apple products</comment>
  </data>
  <data name="RateTheApp" xml:space="preserve">
-    <value>অ্যাপ্লিকেশনটকে রেট দিন</value>
+    <value>Rate the app</value>
  </data>
  <data name="RateTheAppDescription" xml:space="preserve">
    <value>দয়া করে একটি ভাল পর্যালোচনার মাধ্যমে সাহায্য করতে আমাদের বিবেচনা করুন!</value>
@@ -684,7 +684,7 @@
    <value>Item saved</value>
  </data>
  <data name="Submitting" xml:space="preserve">
-    <value>জমা দেওয়া হচ্ছে...</value>
+    <value>Submitting...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Syncing" xml:space="preserve">
@@ -701,7 +701,7 @@
    <value>Sync vault now</value>
  </data>
  <data name="TouchID" xml:space="preserve">
-    <value>টাচ আইডি</value>
+    <value>Touch ID</value>
    <comment>What Apple calls their fingerprint reader.</comment>
  </data>
  <data name="TwoStepLogin" xml:space="preserve">
@@ -717,17 +717,17 @@
    <value>Unlock with PIN code</value>
  </data>
  <data name="Validating" xml:space="preserve">
-    <value>কার্যকর করা হচ্ছে</value>
+    <value>Validating</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="VerificationCode" xml:space="preserve">
-    <value>যাচাইকরণ কোড</value>
+    <value>Verification code</value>
  </data>
  <data name="ViewItem" xml:space="preserve">
    <value>View item</value>
  </data>
  <data name="WebVault" xml:space="preserve">
-    <value>বিটওয়ার্ডেন ওয়েব ভল্ট</value>
+    <value>Bitwarden web vault</value>
  </data>
  <data name="Lost2FAApp" xml:space="preserve">
    <value>Lost authenticator app?</value>
@@ -740,10 +740,10 @@
    <value>Extension activated!</value>
  </data>
  <data name="Icons" xml:space="preserve">
-    <value>আইকন</value>
+    <value>Icons</value>
  </data>
  <data name="Translations" xml:space="preserve">
-    <value>অনুবাদসমূহ</value>
+    <value>Translations</value>
  </data>
  <data name="ItemsForUri" xml:space="preserve">
    <value>Items for {0}</value>
@@ -769,19 +769,19 @@
    <value>2. Switch on the toggle and press OK to accept.</value>
  </data>
  <data name="Disabled" xml:space="preserve">
-    <value>নিষ্ক্রিয়</value>
+    <value>Disabled</value>
  </data>
  <data name="Enabled" xml:space="preserve">
-    <value>সক্রিয়</value>
+    <value>Enabled</value>
  </data>
  <data name="Off" xml:space="preserve">
-    <value>বন্ধ</value>
+    <value>Off</value>
  </data>
  <data name="On" xml:space="preserve">
-    <value>চালু</value>
+    <value>On</value>
  </data>
  <data name="Status" xml:space="preserve">
-    <value>অবস্থা</value>
+    <value>Status</value>
  </data>
  <data name="BitwardenAutofillServiceAlert2" xml:space="preserve">
    <value>The easiest way to add new logins to your vault is from the Bitwarden Auto-fill Service. Learn more about using the Bitwarden Auto-fill Service by navigating to the "Settings" screen.</value>
@@ -876,7 +876,7 @@
    <value>Unable to download file.</value>
  </data>
  <data name="UnableToOpenFile" xml:space="preserve">
-    <value>আপনার ডিভাইস এই ধরনের ফাইল খুলতে পারে না।</value>
+    <value>Your device cannot open this type of file.</value>
  </data>
  <data name="Downloading" xml:space="preserve">
    <value>ডাউনলোড হচ্ছে...</value>
@@ -904,13 +904,13 @@
 Scanning will happen automatically.</value>
  </data>
  <data name="ScanQrTitle" xml:space="preserve">
-    <value>QR কোড স্ক্যান করুন</value>
+    <value>Scan QR Code</value>
  </data>
  <data name="Camera" xml:space="preserve">
-    <value>ক্যামেরা</value>
+    <value>Camera</value>
  </data>
  <data name="Photos" xml:space="preserve">
-    <value>ছবিসমূহ</value>
+    <value>Photos</value>
  </data>
  <data name="CopyTotp" xml:space="preserve">
    <value>Copy TOTP</value>
@@ -934,7 +934,7 @@ Scanning will happen automatically.</value>
    <value>Choose file</value>
  </data>
  <data name="File" xml:space="preserve">
-    <value>ফাইল</value>
+    <value>File</value>
  </data>
  <data name="NoFileChosen" xml:space="preserve">
    <value>No file chosen</value>
@@ -1080,7 +1080,7 @@ Scanning will happen automatically.</value>
    <value>নামের শেষাংশ</value>
  </data>
  <data name="FullName" xml:space="preserve">
-    <value>পুরো নাম</value>
+    <value>Full name</value>
  </data>
  <data name="LicenseNumber" xml:space="preserve">
    <value>লাইসেন্স নম্বর</value>
@@ -1107,34 +1107,34 @@ Scanning will happen automatically.</value>
    <value>Mx</value>
  </data>
  <data name="November" xml:space="preserve">
-    <value>নভেম্বর</value>
+    <value>November</value>
  </data>
  <data name="October" xml:space="preserve">
-    <value>অক্টোবর</value>
+    <value>October</value>
  </data>
  <data name="PassportNumber" xml:space="preserve">
-    <value>পাসপোর্ট নম্বর</value>
+    <value>Passport number</value>
  </data>
  <data name="Phone" xml:space="preserve">
-    <value>ফোন</value>
+    <value>Phone</value>
  </data>
  <data name="September" xml:space="preserve">
-    <value>সেপ্টেম্বর</value>
+    <value>September</value>
  </data>
  <data name="SSN" xml:space="preserve">
-    <value>সামাজিক সুরক্ষা নম্বর</value>
+    <value>Social Security number</value>
  </data>
  <data name="StateProvince" xml:space="preserve">
-    <value>রাজ্য / প্রদেশ</value>
+    <value>State / Province</value>
  </data>
  <data name="Title" xml:space="preserve">
-    <value>শিরোনাম</value>
+    <value>Title</value>
  </data>
  <data name="ZipPostalCode" xml:space="preserve">
-    <value>জিপ / পোস্টকোড</value>
+    <value>Zip / Postal code</value>
  </data>
  <data name="Address" xml:space="preserve">
-    <value>ঠিকানা</value>
+    <value>Address</value>
  </data>
  <data name="Expiration" xml:space="preserve">
    <value>Expiration</value>
@@ -1204,7 +1204,7 @@ Scanning will happen automatically.</value>
    <value>Custom field name</value>
  </data>
  <data name="FieldTypeBoolean" xml:space="preserve">
-    <value>বুলিয়ান</value>
+    <value>Boolean</value>
  </data>
  <data name="FieldTypeHidden" xml:space="preserve">
    <value>Hidden</value>
@@ -1225,7 +1225,7 @@ Scanning will happen automatically.</value>
    <value>Remove</value>
  </data>
  <data name="NewUri" xml:space="preserve">
-    <value>নতুন URI</value>
+    <value>New URI</value>
  </data>
  <data name="URIPosition" xml:space="preserve">
    <value>URI {0}</value>
@@ -1272,7 +1272,7 @@ Scanning will happen automatically.</value>
    <value>Hold your Yubikey near the top of the device.</value>
  </data>
  <data name="TryAgain" xml:space="preserve">
-    <value>আবার চেষ্টা করুন</value>
+    <value>Try again</value>
  </data>
  <data name="YubiKeyInstructionIos" xml:space="preserve">
    <value>To continue, hold your YubiKey NEO against the back of the device.</value>
@@ -1440,16 +1440,16 @@ Scanning will happen automatically.</value>
    <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
  </data>
  <data name="NumberOfWords" xml:space="preserve">
-    <value>শব্দসংখ্যা</value>
+    <value>Number of words</value>
  </data>
  <data name="Passphrase" xml:space="preserve">
-    <value>গুপ্ত-বাক্যাংশ</value>
+    <value>Passphrase</value>
  </data>
  <data name="WordSeparator" xml:space="preserve">
-    <value>শব্দ বিভাজক</value>
+    <value>Word separator</value>
  </data>
  <data name="Clear" xml:space="preserve">
-    <value>পরিষ্কার করুন</value>
+    <value>Clear</value>
    <comment>To clear something out. example: To clear browser history.</comment>
  </data>
  <data name="Generator" xml:space="preserve">
@@ -1474,42 +1474,42 @@ Scanning will happen automatically.</value>
    <value>Export vault</value>
  </data>
  <data name="LockNow" xml:space="preserve">
-    <value>এখনই লক করুন</value>
+    <value>Lock now</value>
  </data>
  <data name="PIN" xml:space="preserve">
-    <value>পিন</value>
+    <value>PIN</value>
  </data>
  <data name="Unlock" xml:space="preserve">
-    <value>আনলক করুন</value>
+    <value>Unlock</value>
  </data>
  <data name="UnlockVault" xml:space="preserve">
    <value>Unlock vault</value>
  </data>
  <data name="ThirtyMinutes" xml:space="preserve">
-    <value>৩০ মিনিট</value>
+    <value>30 minutes</value>
  </data>
  <data name="SetPINDescription" xml:space="preserve">
-    <value>Bitwarden আনলক করার জন্য আপনার পিন কোডটি সেট করুন। আপনি যদি অ্যাপ্লিকেশনটি থেকে পুরোপুরি লগ আউট করেন তবে আপনার পিন সেটিংস রিসেট করা হবে।</value>
+    <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
  </data>
  <data name="LoggedInAsOn" xml:space="preserve">
-    <value>{1}-এ {0} হিসেবে লগইন করা হয়েছে।</value>
+    <value>Logged in as {0} on {1}.</value>
    <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
  </data>
  <data name="VaultLockedMasterPassword" xml:space="preserve">
    <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার প্রধান পাসওয়ার্ডটি যাচাই করান।</value>
  </data>
  <data name="VaultLockedPIN" xml:space="preserve">
-    <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার পিন কোড যাচাই করান।</value>
+    <value>Your vault is locked. Verify your PIN code to continue.</value>
  </data>
  <data name="VaultLockedIdentity" xml:space="preserve">
-    <value>আপনার ভল্ট লক করা আছে। চালিয়ে যেতে আপনার পরিচয় যাচাই করান।</value>
+    <value>Your vault is locked. Verify your identity to continue.</value>
  </data>
  <data name="Dark" xml:space="preserve">
-    <value>গাঢ়</value>
+    <value>Dark</value>
    <comment>A dark color</comment>
  </data>
  <data name="Light" xml:space="preserve">
-    <value>উজ্জ্বল</value>
+    <value>Light</value>
    <comment>A light color</comment>
  </data>
  <data name="FiveMinutes" xml:space="preserve">
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -1887,10 +1887,10 @@ Scanning will happen automatically.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="Text" xml:space="preserve">
-    <value>লেখা</value>
+    <value>Text</value>
  </data>
  <data name="TypeText" xml:space="preserve">
-    <value>লেখা</value>
+    <value>Text</value>
  </data>
  <data name="TypeTextInfo" xml:space="preserve">
    <value>The text you want to send.</value>
@@ -1900,7 +1900,7 @@ Scanning will happen automatically.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="TypeFile" xml:space="preserve">
-    <value>ফাইল</value>
+    <value>File</value>
  </data>
  <data name="TypeFileInfo" xml:space="preserve">
    <value>The file you want to send.</value>
@@ -1918,7 +1918,7 @@ Scanning will happen automatically.</value>
    <value>Text type is not selected, tap to select.</value>
  </data>
  <data name="DeletionDate" xml:space="preserve">
-    <value>মুছে ফেলার তারিখ</value>
+    <value>Deletion date</value>
  </data>
  <data name="DeletionTime" xml:space="preserve">
    <value>Deletion time</value>
@@ -1957,7 +1957,7 @@ Scanning will happen automatically.</value>
    <value>Current access count</value>
  </data>
  <data name="NewPassword" xml:space="preserve">
-    <value>নতুন পাসওয়ার্ড</value>
+    <value>New password</value>
  </data>
  <data name="PasswordInfo" xml:space="preserve">
    <value>Optionally require a password for users to access this Send.</value>
@@ -2030,19 +2030,19 @@ Scanning will happen automatically.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="OneDay" xml:space="preserve">
-    <value>১ দিন</value>
+    <value>1 day</value>
  </data>
  <data name="TwoDays" xml:space="preserve">
-    <value>২ দিন</value>
+    <value>2 days</value>
  </data>
  <data name="ThreeDays" xml:space="preserve">
    <value>3 days</value>
  </data>
  <data name="SevenDays" xml:space="preserve">
-    <value>৭ দিন</value>
+    <value>7 days</value>
  </data>
  <data name="ThirtyDays" xml:space="preserve">
-    <value>৩০ দিন</value>
+    <value>30 days</value>
  </data>
  <data name="Custom" xml:space="preserve">
    <value>Custom</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2240,16 +2234,16 @@ Scanning will happen automatically.</value>
    <value>Options are collapsed, tap to expand.</value>
  </data>
  <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>বড় হাতের অক্ষর (A-Z)</value>
+    <value>Uppercase (A to Z)</value>
  </data>
  <data name="LowercaseAtoZ" xml:space="preserve">
    <value>Lowercase (A to Z)</value>
  </data>
  <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>সংখ্যা (0-9)</value>
+    <value>Numbers (0 to 9)</value>
  </data>
  <data name="SpecialCharacters" xml:space="preserve">
-    <value>বিশেষ অক্ষর (!@#$%^&amp;*)</value>
+    <value>Special characters (!@#$%^&amp;*)</value>
  </data>
  <data name="TapToGoBack" xml:space="preserve">
    <value>Tap to go back</value>
@@ -2352,10 +2346,10 @@ select Add TOTP to store the key safely</value>
    <value>Deny login</value>
  </data>
  <data name="JustNow" xml:space="preserve">
-    <value>এইমাত্র</value>
+    <value>Just now</value>
  </data>
  <data name="XMinutesAgo" xml:space="preserve">
-    <value>{0} মিনিট আগে</value>
+    <value>{0} minutes ago</value>
  </data>
  <data name="LogInAccepted" xml:space="preserve">
    <value>Login confirmed</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2548,7 +2542,7 @@ Do you want to switch to this account?</value>
    <value>Enable camera permission to use the scanner</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>ভাষা</value>
+    <value>Language</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
    <value>The language has been changed to {0}. Please restart the app to see the change</value>
@@ -2575,10 +2569,10 @@ Do you want to switch to this account?</value>
    <value>Weak</value>
  </data>
  <data name="Good" xml:space="preserve">
-    <value>ভালো</value>
+    <value>Good</value>
  </data>
  <data name="Strong" xml:space="preserve">
-    <value>শক্তিশালী</value>
+    <value>Strong</value>
  </data>
  <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
    <value>Check known data breaches for this password</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.bs.resx
+++ b/src/App/Resources/AppResources.bs.resx
@@ -1752,11 +1752,11 @@ Skeniranje će biti izvršeno automatski.</value>
    <value>Želite li zaista poslati u smeće?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrijsko otključavanje onemogućeno do potvrde glavne lozinke.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrijsko otključavanje za auto-ispunu onemogućeno do potvrde glavne lozinke.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Uključi sinkronizaciju pri osvježavanju</value>
@@ -2142,12 +2142,6 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Pravilo tvoje organizacije utječe na vrijeme isteka trezora. Najveće dozvoljeno vrijeme isteka je {0} sata(i) i {1} minuta.</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Vrijeme isteka premašuje ograničenje koju je postavila tvoja organizacija.</value>
  </data>
@@ -2494,8 +2488,8 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Dobijte podsjetnik glavne lozinke</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prijava kao {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nisi ti?</value>
@@ -2608,25 +2602,4 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ca.resx
+++ b/src/App/Resources/AppResources.ca.resx
@@ -1752,11 +1752,11 @@ L'escaneig es farà automàticament.</value>
    <value>Esteu segur que voleu enviar-ho a la paperera?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>El desbloqueig biomètric d'aquest compte està deshabilitat mentre es verifica la contrasenya mestra.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>S'ha detectat un canvi biomètric. Inicieu la sessió mitjançant la contrasenya principal per tornar a activar-la.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>El desbloqueig biomètric d'emplenament automàtic d'aquest compte està deshabilitat mentre es verifica la contrasenya mestra.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Desbloqueig biomètric d'emplenament automàtic deshabilitat. Està pendent de verificació de la contrasenya mestra.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Activa la sincronització en actualitzar-se</value>
@@ -2142,12 +2142,6 @@ L'escaneig es farà automàticament.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Les polítiques de l'organització afecten el temps d'espera de la caixa forta. El temps d'espera màxim permès de la caixa forta és de {0} hores i {1} minuts</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Les polítiques de l'organització afecten el temps d'espera de la vostra caixa forta. El temps d'espera màxim permès és de {0} hores i {1} minuts. L'acció de temps d'espera de la caixa forta està definida en {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Les polítiques de l'organització han establert l'acció de temps d'espera de la caixa forta a {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>El temps d'espera de la caixa forta supera les restriccions establertes per la vostra organització.</value>
  </data>
@@ -2495,8 +2489,8 @@ Voleu canviar a aquest compte?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obteniu la pista de la contrasenya mestra</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Inici de sessió com a {0} a {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connectat com {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>No sou vosaltres?</value>
@@ -2609,25 +2603,4 @@ Voleu canviar a aquest compte?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>No hi ha elements que coincidisquen amb la cerca</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Autoallotjat</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Regió de dades</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regió</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>La vostra contrasenya mestra no compleix una o més de les polítiques de l'organització. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i us demanarà que torneu a iniciar-la. Les sessions en altres dispositius poden continuar romanent actives fins a una hora.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Contrasenya mestra actual</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.cs.resx
+++ b/src/App/Resources/AppResources.cs.resx
--- a/src/App/Resources/AppResources.cy.resx
+++ b/src/App/Resources/AppResources.cy.resx
--- a/src/App/Resources/AppResources.da.resx
+++ b/src/App/Resources/AppResources.da.resx
@@ -1752,11 +1752,11 @@ Skanning vil ske automatisk.</value>
    <value>Er du sikker på, at du sende til papirkurven?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometrisk oplåsning af denne konto deaktiveret afventende bekræftelse af hovedadgangskode.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrisk oplåsning deaktiveret - afventer verifikation af hovedadgangskoden.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autoudfyldelse for biometrisk oplåsning af denne konto deaktiveret afventende bekræftelse af hovedadgangskode.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrisk oplåsning til autoudfyldning deaktiveret - afventer verifikation af hovedadgangskoden.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Tillad synk ved opfriskning</value>
@@ -2142,12 +2142,6 @@ Skanning vil ske automatisk.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Dine organisationspolitikker påvirker din boks-timeout. Maksimum tilladte boks-timeout er {0} time(r) og {1} minut(ter)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Organisationspolitikkerne påvirker boks-timeout. Maks. tilladt boks-timeout er {0} time(r) og {1} minut(ter). Boks-timeout er pt. sat til {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Organisationspolitikker har sat boks-timeouthandlingen til {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Timeout for din boks overskrider de begrænsninger, der er angivet af din organisation.</value>
  </data>
@@ -2495,8 +2489,8 @@ Vil du skifte til denne konto?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Få hovedadgangskodetip</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logger ind som {0} på {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger ind som {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ikke dig?</value>
@@ -2609,25 +2603,4 @@ Vil du skifte til denne konto?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Ingen emner matcher søgningen</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>USA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selv-hostet</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Din hovedadgangskode overholder ikke én eller flere organisationspolitikker. For at få adgang til boksen skal hovedadgangskode opdateres nu. Fortsættes, logges du ud af den nuværende session og vil skulle logger ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Aktuel hovedadgangskode</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -1752,11 +1752,11 @@ Das Scannen erfolgt automatisch.</value>
    <value>Soll dieser Eintrag wirklich in den Papierkorb verschoben werden?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Das Entsperren über Biometrie ist für dieses Konto deaktiviert, bis das Master-Passwort verifiziert wurde.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrisches Entsperren ist deaktiviert, bis das Master-Passwort eingegeben wurde.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Das Entsperren von Auto-Ausfüllen über Biometrie ist für dieses Konto deaktiviert, bis das Master-Passwort verifiziert wurde.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrisches Entsperren für automatisches Ausfüllen ist deaktiviert, bis das Master-Passwort eingegeben wurde.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Synchronisation beim Aktualisieren aktivieren</value>
@@ -2140,13 +2140,7 @@ Das Scannen erfolgt automatisch.</value>
    <value>Diese Organisation hat eine Unternehmensrichtlinie, die dich automatisch für die Passwortzurücksetzung registriert. Die Registrierung wird es Administratoren der Organisation erlauben, dein Master-Passwort zu ändern.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Deine Unternehmensrichtlinien haben das maximal zulässige Tresor-Timeout auf {0} Stunde(n) und {1} Minute(n) festgelegt.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Deine Organisationsrichtlinien beeinflussen dein Tresor-Timeout. Das maximal zulässige Tresor-Timeout beträgt {0} Stunde(n) und {1} Minute(n). Deine Tresor-Timeout-Aktion ist auf {2} gesetzt.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Deine Organisationsrichtlinien haben deine Tresor-Timeout-Aktion auf {0} gesetzt.</value>
+    <value>Deine Organisationsrichtlinien haben Auswirkungen auf dein Tresor-Timeout. Das maximal zulässige Tresor-Timeout beträgt {0} Stunde(n) und {1} Minute(n)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Dein Tresor-Timeout überschreitet die von deinem Unternehmen festgelegten Beschränkungen.</value>
@@ -2494,8 +2488,8 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Hinweis zum Master-Passwort erhalten</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Anmelden als {0} auf {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Anmelden als {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nicht du?</value>
@@ -2608,25 +2602,4 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Es gibt keine Einträge, die mit der Suche übereinstimmen</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Selbst gehostet</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datenregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Dein Master-Passwort entspricht nicht einer oder mehreren Richtlinien deiner Organisation. Um auf den Tresor zugreifen zu können, musst du dein Master-Passwort jetzt aktualisieren. Wenn du fortfährst, wirst du von deiner aktuellen Sitzung abgemeldet und musst dich erneut anmelden. Aktive Sitzungen auf anderen Geräten können noch bis zu einer Stunde lang aktiv bleiben.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Aktuelles Master-Passwort</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -1752,11 +1752,11 @@
    <value>Θέλετε πραγματικά να στείλετε στον κάδο απορριμμάτων;</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Το βιομετρικό ξεκλείδωμα για αυτόν τον λογαριασμό είναι απενεργοποιημένο εν αναμονή της επαλήθευσης του κύριου κωδικού πρόσβασης.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Εντοπίστηκε βιομετρική αλλαγή, συνδεθείτε χρησιμοποιώντας τον κύριο κωδικό πρόσβασης για ενεργοποίηση ξανά.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Το βιομετρικό ξεκλείδωμα αυτόματης συμπλήρωσης για αυτό το λογαριασμό είναι απενεργοποιημένο εν αναμονή της επαλήθευσης του κύριου κωδικού πρόσβασης.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Το βιομετρικό ξεκλείδωμα για αυτόματη συμπλήρωση απενεργοποιήθηκε εν αναμονή της επαλήθευσης του κύριου κωδικού πρόσβασης.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Ενεργοποίηση συγχρονισμού κατά την ανανέωση</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Οι πολιτικές του οργανισμού σας επηρεάζουν το χρονικό όριο vault σας. Το μέγιστο επιτρεπόμενο Χρονικό όριο Vault είναι {0} ώρα(ες) και {1} λεπτό(ά)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Οι πολιτικές του οργανισμού σας επηρεάζουν το χρονικό όριο του vault σας. Το μέγιστο επιτρεπόμενο χρονικό όριο vault είναι {0} ώρα(ες) και {1} λεπτό(ά). Το χρονικό όριο του vault σας έχει οριστεί σε {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Οι πολιτικές του οργανισμού σας έχουν ορίσει την ενέργεια χρονικού ορίου vault σε {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Το χρονικό όριο του vault σας υπερβαίνει τους περιορισμούς που έχει ορίσει ο οργανισμός σας.</value>
  </data>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Λάβετε υπόδειξη κύριου κωδικού</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Σύνδεση ως {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Δεν είστε εσείς;</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Δεν υπάρχουν στοιχεία που να ταιριάζουν με την αναζήτηση</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ο κύριος κωδικός πρόσβασής σας δεν πληροί μία ή περισσότερες πολιτικές του οργανισμού σας. Για να αποκτήσετε πρόσβαση στο Vault σας, πρέπει να ενημερώσετε τον κύριο κωδικό πρόσβασής σας τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές εώς και μία ώρα.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Τρέχων κύριος κωδικός</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the bin?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2142,12 +2142,6 @@ Scanning will happen automatically.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Your organisation policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organisation.</value>
  </data>
@@ -2495,8 +2489,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2609,25 +2603,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.en-IN.resx
+++ b/src/App/Resources/AppResources.en-IN.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the bin?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric change detected, login using master password to enable again.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Enable sync on refresh</value>
@@ -2156,12 +2156,6 @@ Scanning will happen automatically.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
  </data>
@@ -2509,8 +2503,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2623,25 +2617,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -1752,11 +1752,11 @@ El escaneo se realizará automáticamente.</value>
    <value>¿Seguro que quieres enviarlo a la papelera?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>El desbloqueo biométrico para esta cuenta está deshabilitado hasta que se verifique la contraseña maestra.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Se ha detectado un cambio biométrico, inicie sesión usando la contraseña maestra para volver a activarlo.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>El desbloqueo biométrico para autorrelleno de esta cuenta está deshabilitado hasta que realice la verificación de la contraseña maestra.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Desbloqueo biométrico para autorrellenar desactivado hasta la verificación de la contraseña maestra.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Habilitar sincronización al actualizar</value>
@@ -2142,12 +2142,6 @@ El escaneo se realizará automáticamente.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Las políticas de su organización están afectando el tiempo de espera de tu caja fuerte. El máximo permitido de tiempo de espera es {0} hora(s) y {1} minuto(s)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Las políticas de tu organización están afectando el tiempo de espera de tu caja fuerte. El tiempo máximo permitido para la bóveda es de {0} hora(s) y de {1} minuto(s). Su acción de tiempo de espera de la bóveda se ha establecido en {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Las políticas de su organización han establecido la acción de tiempo de espera de su caja fuerte a {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>El tiempo de espera de tu caja fuerte excede las restricciones establecidas por tu organización.</value>
  </data>
@@ -2496,8 +2490,8 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obtener pista de contraseña maestra</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Iniciando sesión como {0} en {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Iniciando sesión como {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>¿No eres tú?</value>
@@ -2610,25 +2604,4 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>No hay elementos que coincidan con la búsqueda</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>EE.UU.</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Unión Europea</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Autoalojado</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Región de datos</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Región</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Su contraseña maestra no cumple con una o más de las políticas de su organización. Para acceder a la caja fuerte, debe actualizar su contraseña maestra ahora. Proceder le desconectará de su sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante hasta una hora.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Contraseña maestra actual</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.et.resx
+++ b/src/App/Resources/AppResources.et.resx
@@ -1752,11 +1752,11 @@ Skaneerimine toimub automaatselt.</value>
    <value>Oled kindel, et soovid kirje(d) prügikasti teisaldada?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biomeetriaga lahtilukustamine on keelatud. Oodatakse ülemparooli sisestamist.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Automaattäite kinnitamine läbi biomeetria on keelatud. Oodatakse ülemparooli sisestamist.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Automaattäite ja biomeetrilise avamise kasutamine on keelatud. Oodatakse ülemprooli sisestamist.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Automaattäite kinnitamine läbi biomeetria on keelatud. Oodatakse ülemparooli sisestamist.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Luba allatõmbel sünkroniseerimine</value>
@@ -2140,13 +2140,7 @@ Skaneerimine toimub automaatselt.</value>
    <value>Selle organisatsiooni poliitika kohaselt liidetakse sind automaatselt ülemparooli lähtestamise funktsiooniga. Liitumisel saavad organisatsiooni administraatorid sinu ülemparooli muuta.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Organisatsiooni poliitikad mõjutavad sinu hoidla ajalõppu. Maksimaalne lubatud hoidla ajalõpp on {0} tund(i) ja {1} minut(it).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Organisatsiooni poliitikad mõjutavad sinu hoidla ajalõppu. Maksimaalne lubatud hoidla ajalõpp on {0} tund(i) ja {1} minut(it). Sinu hoidla ajalõpu tegevus on {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Organisatsiooni poliitika on sinu hoidla ajalõpu tegevuse seadistanud {0} peale.</value>
+    <value>Organisatsiooni poliitikad mõjutavad sinu hoidla ajalõppu. Maksimaalne lubatud hoidla ajalõpp on {0}  tund(i) ja {1} minut(it)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Valitud hoidla ajalõpp ei ole organisatsiooni poolt määratud reeglitega kooskõlas.</value>
@@ -2495,8 +2489,8 @@ Soovid selle konto peale lülituda?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Tuleta ülemparooli vihjega meelde</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Sisselogimas kui {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Pole sina?</value>
@@ -2609,25 +2603,4 @@ Soovid selle konto peale lülituda?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Otsingusõnale ei vasta kirjeid</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Sinu ülemparool ei vasta ühele või rohkemale organisatsiooni poolt seatud poliitikale. Hoidlale ligipääsemiseks pead oma ülemaprooli uuendama. Jätkamisel logitakse sind praegusest sessioonist välja, mistõttu pead uuesti sisse logima. Teistes seadmetes olevad aktiivsed sessioonid aeguvad umbes ühe tunni jooksul.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Praegune ülemparool</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.eu.resx
+++ b/src/App/Resources/AppResources.eu.resx
@@ -1751,11 +1751,11 @@
    <value>Ziur zaude elementu hau zakarrontzira bidali nahi duzula?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Desblokeatze biometrikoa desgaituta dago, pasahitz nagusiarekin saioa hasi zain.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Auto-betetzerako desblokeatze biometrikoa desgaituta dago, pasahitz nagusiarekin saioa hasi zain.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Gaitu eguneratzean sinkronizatzea</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Zure erakundearen politikek zure itxaronaldiari eragiten diote. Itxaronaldiak gehienez ere {0} ordu eta {1} minutu izango ditu</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Zure kutxa gotorreko itxaronaldiak, zure erakundeak ezarritako murrizpenak gainditzen ditu.</value>
  </data>
@@ -2494,8 +2488,8 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Jaso pasahitz nagusiaren pista</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} bezala hasi saioa</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ez zara zu?</value>
@@ -2608,25 +2602,4 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.fa.resx
+++ b/src/App/Resources/AppResources.fa.resx
@@ -1752,11 +1752,11 @@
    <value>واقعاً می‌خواهید این آیتم را به سطل زباله ارسال کنید؟</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>باز کردن قفل بیومتریک برای این حساب کاربری در انتظار تأیید کلمه عبور اصلی غیرفعال است.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>تغییر بیومتریک شناسایی شد، برای فعال کردن مجدد آن با استفاده از کلمه عبور اصلی وارد سیستم شوید.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>باز کردن قفل پر کردن خودکار بیومتریک برای این حساب کاربری در انتظار تأیید کلمه عبور اصلی غیرفعال است.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>باز کردن قفل بیومتریک برای پرکردن خودکار در انتظار تأیید کلمه عبور اصلی غیرفعال است.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>فعال کردن همگام‌سازی در نوسازی</value>
@@ -2143,12 +2143,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>سیاست‌های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق {0} ساعت و {1} دقیقه است</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>سیاست‌های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق {0} ساعت و {1} دقیقه است. عملگر مهلت زمانی گاوصندوق شما روی {2} تنظیم شده است.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>سباست‌های سازمان شما، عملگر زمان‌بندی گاوصندوق شما را روی {0} تنظیم کرده است.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>مهلت زمانی شما بیش از محدودیت های تعیین شده توسط سازمانتان است.</value>
  </data>
@@ -2496,8 +2490,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>دریافت یادآور کلمه عبور اصلی</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>در حال ورود به عنوان {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>شما نیستید؟</value>
@@ -2610,25 +2604,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>هیچ موردی وجود ندارد که با جستجو مطابقت داشته باشد</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>کلمه عبور اصلی فعلی</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.fi.resx
+++ b/src/App/Resources/AppResources.fi.resx
@@ -1281,7 +1281,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Esteettömyyspalvelu voi olla hyödyllinen sellaisten sovellusten kanssa, jotka eivät tue tavallista automaattisen täytön palvelua.</value>
  </data>
  <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Salasana vaihdettiin</value>
+    <value>Salasana päivitettiin</value>
    <comment>ex. Date this password was updated</comment>
  </data>
  <data name="DateUpdated" xml:space="preserve">
@@ -1492,7 +1492,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetukset tyhjentyvät, jos kirjaudut kokonaan ulos sovelluksesta.</value>
  </data>
  <data name="LoggedInAsOn" xml:space="preserve">
-    <value>Kirjautui palvelimelle {1} tunnuksella {0}.</value>
+    <value>Kirjautui tunnuksella {0} palvelimelle {1}.</value>
    <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
  </data>
  <data name="VaultLockedMasterPassword" xml:space="preserve">
@@ -1752,11 +1752,11 @@ Koodi luetaan automaattisesti.</value>
    <value>Haluatko varmasti siirtää roskakoriin?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometrinen avaus on poistettu käytöstä tältä tililtä, kunnes pääsalasana on vahvistettu.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrinen avaus on poistettu käytöstä, kunnes pääsalasana on vahvistettu.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Automaattisen täytön biometrinen avaus on poistettu käytöstä tältä tililtä, kunnes pääsalasana on vahvistettu.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Automaattisen täytön biometrinen avaus on poistettu käytöstä, kunnes pääsalasana on vahvistettu.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Synkronoi holvi päivityksen yhteydessä</value>
@@ -2090,13 +2090,13 @@ Koodi luetaan automaattisesti.</value>
    <value>Captcha-vahvistus epäonnistui. Yritä uudelleen.</value>
  </data>
  <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Pääsalasanasi on vaihdettu</value>
+    <value>Pääsalasana päivitettiin</value>
  </data>
  <data name="UpdateMasterPassword" xml:space="preserve">
-    <value>Päivitä pääsalasana</value>
+    <value>Vaihda pääsalasana</value>
  </data>
  <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>Organisaatiosi ylläpito on hiljattain vaihtanut pääsalasanasi ja käyttääksesi holvia sinun on päivitettävä se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan.</value>
+    <value>Organisaatiosi ylläpito on hiljattain vaihtanut pääsalasanasi. Käyttääksesi holvia sinun on päivitettävä pääsalasanasi nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan.</value>
  </data>
  <data name="UpdatingPassword" xml:space="preserve">
    <value>Salasanaa vaihdetaan</value>
@@ -2141,13 +2141,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Organisaatiolla on käytäntö, joka liittää tilisi automaattisesti salasanan palautusapuun. Liitos sallii organisaation ylläpitäjien vaihtaa pääsalasanasi.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Organisaatiokäytännöt ovat määrittäneet holvisi aikakatkaisun enimmäisajaksi {0} tunti(a) {1} minuutti(a).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Organisaatiokäytännöt vaikuttavat holvisi aikakatkaisuun. Suurin sallittu aika on {0} tunti(a) {1} minuutti(a). Holvillesi määritetty aikakatkaisutoiminto on {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Organisaatiokäytännöt ovat määrittäneet holville aikakatkaisutoiminnon {0}.</value>
+    <value>Organisaatiokäytännöt vaikuttavat holvisi aikakatkaisuun. Suurin sallittu aika on {0} tunti(a) ja {1} minuutti(a).</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Holvisi aikakatkaisu ylittää organisaatiosi asettamat rajoitukset.</value>
@@ -2496,8 +2490,8 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Pyydä pääsalasanan vihjettä</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Kirjaudutaan palvelimelle {1} tunnuksella {0}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Kirjaudutaan tunnuksella {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Etkö se ollut sinä?</value>
@@ -2602,7 +2596,7 @@ Haluatko vaihtaa tähän tiliin?</value>
    <value>Lisää avain olemassa olevaan tai uuteen kohteeseen</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>Holvissasi ei ole kohdetta "{0}" vastavia tietoja</value>
+    <value>Holvissasi ei ole kohteita osoitteelle "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
    <value>Etsi kohdetta tai lisää uusi kohde</value>
@@ -2610,25 +2604,4 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Hakua vastaavia kohteita ei ole</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Itse ylläpidetty</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Tietoalue</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Alue</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Pääsalasanasi ei täytä yhden tai useamman organisaatiokäytännön vaatimuksia ja holvin käyttämiseksi sinun on vaihdettava se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Nykyinen pääsalasana</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -1752,11 +1752,11 @@ Awtomatikong itong magsa-scan.</value>
    <value>Gusto mo ba talaga itong itapon?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Na-disable ang biometrikong pag-unlock, naghihintay para sa beripikasyon ng master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Na-disable ang biometrikong pag-unlock para sa autofill, naghihintay para sa beripikasyon ng master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Payagan ang pag-sync pagka-refresh</value>
@@ -2143,12 +2143,6 @@ Awtomatikong itong magsa-scan.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Naaapektuhan ng mga patakaran sa organisasyon mo ang time-out ng vault mo. {0} oras at {1} minuto ang pinakamataas na pinapayagang time-out ng vault.</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Lumagpas ang time-out ng vault mo sa mga restriksyong ipinapatupad ng organisasyon mo.</value>
  </data>
@@ -2496,8 +2490,8 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Kunin ang palatandaan ng master password</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Nagla-log in bilang si {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Hindi ikaw?</value>
@@ -2610,25 +2604,4 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Walang mga item na tumutugma sa paghahanap</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -1752,11 +1752,11 @@ La numérisation se fera automatiquement.</value>
    <value>Voulez-vous vraiment envoyer à la corbeille ?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Le déverrouillage biométrique pour ce compte est désactivé en attente de vérification du mot de passe maître.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Déverrouillage biométrique désactivé dans l'attente de vérification du mot de passe principal.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Le déverrouillage biométrique de saisie automatique pour ce compte est désactivé en attente de vérification du mot de passe maître.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Déverrouillage biométrique pour la saisie automatique désactivé dans l'attente de vérification du mot de passe principal.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Autoriser la synchronisation au rafraîchissement</value>
@@ -2141,13 +2141,7 @@ La numérisation se fera automatiquement.</value>
    <value>Cette organisation dispose d'une politique d'entreprise qui vous inscrira automatiquement à la réinitialisation du mot de passe. L'inscription permettra aux administrateurs de l'organisation de changer votre mot de passe principal.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Les politiques de sécurité de votre organisation ont défini le délai d'expiration de votre coffre à {0} heure(s) et {1} minute(s) maximum.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Les politiques de sécurité de votre organisation affectent le délai d'expiration de votre coffre. Le délai d'expiration autorisé du coffre est de {0} heure(s) et {1} minute(s) maximum. L'action après délai d'expiration de votre coffre est fixée à {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Les politiques de sécurité de votre organisation ont défini l'action après délai d'expiration de votre coffre à {0}.</value>
+    <value>Les politiques de sécurité de votre organisation affectent le délai d'expiration de votre coffre. Le délai d'expiration autorisé du coffre est de {0} heure(s) et {1} minute(s) maximum</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Le délai d'expiration de votre coffre dépasse les restrictions définies par votre organisation.</value>
@@ -2496,8 +2490,8 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obtenir l'indice du mot de passe principal</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Connexion en tant que {0} sur {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connecté en tant que {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ce n'est pas vous ?</value>
@@ -2610,25 +2604,4 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Il n'y a pas d'éléments qui correspondent à la recherche</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Auto-hébergé</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Région des données</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Région</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Votre mot de passe principal ne répond pas aux exigences de politique de sécurité de cette organisation. Pour accéder au coffre, vous devez mettre à jour votre mot de passe principal dès maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuver rester actives pendant encore une heure.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Mot de passe principal actuel</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.gl.resx
+++ b/src/App/Resources/AppResources.gl.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.he.resx
+++ b/src/App/Resources/AppResources.he.resx
@@ -1754,11 +1754,11 @@ Scanning will happen automatically.</value>
    <value>האם אתה בטוח שברצונך לשלוח פריט זה לסל המחזור?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>פתיחה באמצעות זיהוי ביומטרי ממתינה לאימות הסיסמה הראשית.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>פתיחה באמצעים ביומטריים עבור השלמה אוטומטית - מצריכה אימות בעזרת סיסמה ראשית.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>אפשר סנכרון בעת רענון</value>
@@ -2145,12 +2145,6 @@ Scanning will happen automatically.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>מדיניות הארגון שלך משפיעה על הזמן הקצוב לכספת שלך. הזמן הקצוב המרבי המותר לכספת הוא {0} שעות ו-{1} דקות</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>הזמן הקצוב לכספת שלך חורג מהמגבלות שנקבעו על ידי הארגון שלך.</value>
  </data>
@@ -2498,8 +2492,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2612,25 +2606,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.hi.resx
+++ b/src/App/Resources/AppResources.hi.resx
--- a/src/App/Resources/AppResources.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -1751,11 +1751,11 @@
    <value>Želite li zaista poslati u smeće?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrijsko otključavanje onemogućeno do potvrde glavne lozinke.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrijsko otključavanje za auto-ispunu onemogućeno do potvrde glavne lozinke.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Uključi sinkronizaciju pri osvježavanju</value>
@@ -2141,12 +2141,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Pravilo tvoje organizacije utječe na istek trezora. Najveće dozvoljeno vrijeme isteka je {0}:{1} h.</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Vrijeme isteka premašuje ograničenje koje je postavila tvoja organizacija.</value>
  </data>
@@ -2493,8 +2487,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Slanje podsjetnika glavne lozinke</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prijava kao {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nisi ti?</value>
@@ -2607,25 +2601,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Nema stavki koje odgovaraju pretrazi</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.hu.resx
+++ b/src/App/Resources/AppResources.hu.resx
@@ -1751,11 +1751,11 @@
    <value>Biztosan a lomtárba kerüljön?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>A biometrikus feloldás ennél a fióknál letiltásra került a mesterjelszó ellenőrzéséig.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrikus változás lett észlelve, bejelentkezés mesterjelszóval az ismételt engedélyezéshez.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Az automatikus kitöltés biometrikus feloldása ennél a fióknál letiltásra került a mesterjelszó ellenőrzéséig.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Az automatikus kitöltés biometrikus feloldása letiltásra került a fő jelszó ellenőrzéséig.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Szinkronizálás engedélyezése frissítéskor</value>
@@ -2141,12 +2141,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>A szervezeti házirendek hatással vannak a széf időkorlátjára. A széf időkorlátja legfeljebb {0} óra és {1} perc lehet.</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>A szervezeti házirendek hatással vannak a széf időkorlátjára. A széf időkorlátja legfeljebb {0} óra és {1} perc lehet. A széf időkifutási művelete {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>A szervezeti házirendek által jelenleg beállított időkifutási művelet {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>A széf időkorlátja túllépi a szervezet által beállított korlátozást.</value>
  </data>
@@ -2494,8 +2488,8 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Mesterjelszó emlékeztető kérése</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Bejelentkezve mint {0} :: {1}.</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Bejelentkezve mint {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ez tévedés?</value>
@@ -2608,25 +2602,4 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Nincsenek a keresésnek megfelelő elemek.</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Saját kiszolgáló</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Adatrégió</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Régió</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>A mesterjelszó nem felel meg egy vagy több szervezeti szabályzatnak. A széf eléréséhez frissíteni kell a meszerjelszót. A továbblépés kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A többi eszközön lévő aktív munkamenetek akár egy óráig is aktívak maradhatnak.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Jelenlegi mesterjelszó</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.id.resx
+++ b/src/App/Resources/AppResources.id.resx
@@ -1752,11 +1752,11 @@ Proses pindai akan terjadi secara otomatis.</value>
    <value>Yakin ingin mengirim ke sampah?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Perubahan biometrik terdeteksi, login menggunakan Master Password untuk mengaktifkan kembali.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Buka kunci biometrik untuk pengisian otomatis dinonaktifkan sambil menunggu verifikasi kata sandi utama.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Aktifkan sinkronisasi saat refresh</value>
@@ -2142,12 +2142,6 @@ Proses pindai akan terjadi secara otomatis.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Kebijakan organisasi Anda memengaruhi waktu tunggu brankas Anda. Batas maksimal Waktu Tunggu Brankas yang diizinkan adalah {0} jam dan {1} menit</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
  </data>
@@ -2495,8 +2489,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2609,25 +2603,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.it.resx
+++ b/src/App/Resources/AppResources.it.resx
@@ -419,7 +419,7 @@
    <value>Estensione app</value>
  </data>
  <data name="AutofillAccessibilityDescription" xml:space="preserve">
-    <value>Usa il servizio di accessibilità di Bitwarden per il riempimento automatico dei tuoi login su app e web.</value>
+    <value>Usa il servizio di accessibilità di Bitwarden per l'auto-completamento dei tuoi login su app e web.</value>
  </data>
  <data name="AutofillService" xml:space="preserve">
    <value>Servizio di riempimento automatico</value>
@@ -434,13 +434,13 @@
    <value>Il modo più semplice per aggiungere nuovi login alla tua cassaforte è usare l'estensione di riempimento automatico di Bitwarden. Scopri di più su come usare l'estensione di riempimento automatico di Bitwarden nelle impostazioni.</value>
  </data>
  <data name="BitwardenAppExtensionDescription" xml:space="preserve">
-    <value>Usa Bitwarden su Safari e altre app per riempire automaticamente i tuoi login.</value>
+    <value>Usa Bitwarden su Safari e altre applicazioni per auto-completare i tuoi login.</value>
  </data>
  <data name="BitwardenAutofillService" xml:space="preserve">
-    <value>Servizio di riempimento automatico di Bitwarden</value>
+    <value>Servizio auto-completamento di Bitwarden</value>
  </data>
  <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
-    <value>Usa il servizio di accessibilità Bitwarden per riempire automaticamente i tuoi login.</value>
+    <value>Usa il servizio di accessibilità Bitwarden per auto-completare i tuoi login.</value>
  </data>
  <data name="ChangeEmail" xml:space="preserve">
    <value>Cambia email</value>
@@ -483,7 +483,7 @@
    <value>Quasi fatto!</value>
  </data>
  <data name="ExtensionEnable" xml:space="preserve">
-    <value>Abilita l'estensione dell'app</value>
+    <value>Abilita l'estensione dell'applicazione</value>
  </data>
  <data name="ExtensionInSafari" xml:space="preserve">
    <value>Su Safari, trova Bitwarden utilizzando l'icona di condivisione (scorri a destra sulla riga inferiore del menu).</value>
@@ -496,7 +496,7 @@
    <value>Sei pronto ad accedere!</value>
  </data>
  <data name="ExtensionSetup" xml:space="preserve">
-    <value>I tuoi login sono ora facilmente accessibili da Safari, Chrome e altre app supportate.</value>
+    <value>I tuoi login sono ora facilmente accessibili da Safari, Chrome e altre applicazioni supportate.</value>
  </data>
  <data name="ExtensionSetup2" xml:space="preserve">
    <value>In Safari e Chrome, trova Bitwarden utilizzando l'icona di condivisione (scorri a destra sulla riga in basso del menu Condividi).</value>
@@ -505,7 +505,7 @@
    <value>Clicca l'icona di Bitwarden nel menu per avviare l'estensione.</value>
  </data>
  <data name="ExtensionTurnOn" xml:space="preserve">
-    <value>Per attivare Bitwarden su Safari e altre app, clicca l'icona "altro" sull'ultima riga del menu.</value>
+    <value>Per attivare Bitwarden su Safari e altre applicazioni, tocca l'icona "altro" sull'ultima riga del menu.</value>
  </data>
  <data name="Favorite" xml:space="preserve">
    <value>Preferito</value>
@@ -598,7 +598,7 @@
    <value>Altre impostazioni</value>
  </data>
  <data name="MustLogInMainApp" xml:space="preserve">
-    <value>È necessario accedere all'app principale di Bitwarden prima di poter utilizzare l'estensione.</value>
+    <value>È necessario accedere all'applicazione principale di Bitwarden prima di poter utilizzare l'estensione.</value>
  </data>
  <data name="Never" xml:space="preserve">
    <value>Mai</value>
@@ -623,7 +623,7 @@
    <comment>Confirmation, like "Ok, I understand it"</comment>
  </data>
  <data name="OptionDefaults" xml:space="preserve">
-    <value>Le opzioni predefinite sono impostate dal generatore di password dell'app principale Bitwarden.</value>
+    <value>Le opzioni predefinite sono impostate dal generatore di password dell'applicazione principale Bitwarden.</value>
  </data>
  <data name="Options" xml:space="preserve">
    <value>Opzioni</value>
@@ -660,7 +660,7 @@
    <value>Rigenera password</value>
  </data>
  <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>Inserisci password principale di nuovo</value>
+    <value>Digita nuovamente la password</value>
  </data>
  <data name="SearchVault" xml:space="preserve">
    <value>Cerca nella cassaforte</value>
@@ -708,7 +708,7 @@
    <value>Verifica in due passaggi</value>
  </data>
  <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>La verifica in due passaggi rende il tuo account più sicuro richiedendoti di verificare il tuo login usando un altro dispositivo come una chiave di sicurezza, app di autenticazione, SMS, telefonata, o email. Può essere abilitata nella cassaforte web su bitwarden.com. Vuoi visitare il sito?</value>
+    <value>La verifica in due passaggi rende il tuo account più sicuro richiedendoti di verificare il tuo login usando un altro dispositivo come una chiave di sicurezza, applicazione di autenticazione, SMS, telefonata, o email. Può essere abilitata nella cassaforte web su bitwarden.com. Vuoi visitare il sito?</value>
  </data>
  <data name="UnlockWith" xml:space="preserve">
    <value>Sblocca con {0}</value>
@@ -815,11 +815,11 @@
    <comment>Message shown when trying to launch an app that does not exist on the user's device.</comment>
  </data>
  <data name="AuthenticatorAppTitle" xml:space="preserve">
-    <value>App di autenticazione</value>
+    <value>Applicazione di autenticazione</value>
    <comment>For 2FA</comment>
  </data>
  <data name="EnterVerificationCodeApp" xml:space="preserve">
-    <value>Inserisci il codice di verifica a 6 cifre dalla tua app di autenticazione.</value>
+    <value>Digita il codice di verifica a 6 cifre dalla tua applicazione di autenticazione.</value>
    <comment>For 2FA</comment>
  </data>
  <data name="EnterVerificationCodeEmail" xml:space="preserve">
@@ -842,7 +842,7 @@
    <comment>Remember my two-step login</comment>
  </data>
  <data name="SendVerificationCodeAgain" xml:space="preserve">
-    <value>Invia email con codice di verifica di nuovo</value>
+    <value>Invia nuovamente l'email con il codice di verifica</value>
    <comment>For 2FA</comment>
  </data>
  <data name="TwoStepLoginOptions" xml:space="preserve">
@@ -1052,7 +1052,7 @@
    <value>Dicembre</value>
  </data>
  <data name="Dr" xml:space="preserve">
-    <value>Dott</value>
+    <value>Dott.</value>
  </data>
  <data name="ExpirationMonth" xml:space="preserve">
    <value>Mese di scadenza</value>
@@ -1094,7 +1094,7 @@
    <value>Secondo nome</value>
  </data>
  <data name="Mr" xml:space="preserve">
-    <value>Sig</value>
+    <value>Sig.</value>
  </data>
  <data name="Mrs" xml:space="preserve">
    <value>Sig.ra</value>
@@ -1294,7 +1294,7 @@
    <value>Devi accedere all'app principale di Bitwarden per usare il riempimento automatico.</value>
  </data>
  <data name="AutofillSetup" xml:space="preserve">
-    <value>I tuoi login sono ora facilmente accessibili dalla tastiera mentre accedi a siti web e app.</value>
+    <value>I tuoi login sono ora facilmente accessibili dalla tastiera durante l'accesso a siti web e app.</value>
  </data>
  <data name="AutofillSetup2" xml:space="preserve">
    <value>Ti consigliamo di disabilitare qualsiasi altra app di riempimento automatico nelle impostazioni se non prevedi di usarle.</value>
@@ -1359,7 +1359,7 @@
    <value>Questa password è stata trovata {0} volta(e) in archivi di dati trafugati. Dovresti cambiarla.</value>
  </data>
  <data name="PasswordSafe" xml:space="preserve">
-    <value>Questa password non è stata trovata in violazioni di dati note. Dovrebbe essere sicura da usare.</value>
+    <value>Questa password non è stata trovata in dati violati noti. Dovrebbe essere sicura da usare.</value>
  </data>
  <data name="IdentityName" xml:space="preserve">
    <value>Nome dell'identità</value>
@@ -1436,7 +1436,7 @@
    <value>Nessuna organizzazione da mostrare.</value>
  </data>
  <data name="MoveToOrgDesc" xml:space="preserve">
-    <value>Scegli un'organizzazione in cui vuoi spostare questo elemento. Spostarlo in un'organizzazione trasferisce la proprietà dell'elemento all'organizzazione. Una volta spostato, non sarai più il proprietario diretto di questo elemento.</value>
+    <value>Scegli un'organizzazione in cui vuoi spostare questo elemento. Spostarlo in un'organizzazione trasferisce la proprietà dell'elemento all'organizzazione. Una volta spostato non sarai più il proprietario diretto di questo elemento.</value>
  </data>
  <data name="NumberOfWords" xml:space="preserve">
    <value>Numero di parole</value>
@@ -1539,14 +1539,14 @@
    <comment>Default URI match detection for auto-fill.</comment>
  </data>
  <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
-    <value>Scegli il modo predefinito in cui il rilevamento della corrispondenza URI è gestito per i login quando si eseguono azioni come il riempimento automatico.</value>
+    <value>Scegli il modo predefinito in cui il rilevamento della corrispondenza URI viene gestito per i login quando si eseguono azioni come il riempimento automatico.</value>
  </data>
  <data name="Theme" xml:space="preserve">
    <value>Tema</value>
    <comment>Color theme</comment>
  </data>
  <data name="ThemeDescription" xml:space="preserve">
-    <value>Cambia il tema dell'app.</value>
+    <value>Cambia il tema dell'applicazione.</value>
  </data>
  <data name="ThemeDefault" xml:space="preserve">
    <value>Predefinito (Sistema)</value>
@@ -1567,7 +1567,7 @@
    <value>Sei sicuro di voler uscire da Bitwarden?</value>
  </data>
  <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
-    <value>Vuoi richiedere lo sblocco con la password principale quando l'app è riavviata?</value>
+    <value>Vuoi richiedere lo sblocco con la password principale quando l'applicazione viene riavviata?</value>
  </data>
  <data name="Black" xml:space="preserve">
    <value>Nero</value>
@@ -1667,10 +1667,10 @@
    <value>Conferma la tua identità per continuare.</value>
  </data>
  <data name="ExportVaultWarning" xml:space="preserve">
-    <value>Questa esportazione contiene i dati della tua cassaforte in un formato non criptato. Non salvare o inviare il file esportato attraverso canali non protetti (come le email). Eliminalo immediatamente dopo l'utilizzo.</value>
+    <value>Questa esportazione contiene i dati della tua cassaforte in formato non criptato. Non archiviare o inviare il file di esportazione attraverso canali non sicuri (come email). Eliminalo immediatamente dopo che hai finito di usarli.</value>
  </data>
  <data name="EncExportKeyWarning" xml:space="preserve">
-    <value>Questa esportazione cripta i tuoi dati usando la chiave di criptografia del tuo account. Se cambi la chiave di criptografia del tuo account, non potrai più decifrare il file esportato e dovrai eseguire una nuova esportazione.</value>
+    <value>Questa esportazione cripta i tuoi dati utilizzando la chiave di criptografia del tuo account. Se cambi la chiave di criptografia del tuo account, non potrai più decriptare il file esportato e dovrai creare un nuovo file di esportazione.</value>
  </data>
  <data name="EncExportAccountWarning" xml:space="preserve">
    <value>Le chiavi di criptografia dell'account sono uniche per ogni account Bitwarden, quindi non puoi importare un file di esportazione criptato in un account diverso.</value>
@@ -1686,7 +1686,7 @@
    <value>Si è verificato un problema esportando la tua cassaforte. Se il problema persiste, esportala dalla cassaforte web.</value>
  </data>
  <data name="ExportVaultSuccess" xml:space="preserve">
-    <value>Cassaforte esportata</value>
+    <value>Cassaforte esportata correttamente</value>
  </data>
  <data name="Clone" xml:space="preserve">
    <value>Clona</value>
@@ -1751,11 +1751,11 @@
    <value>Sei sicuro di voler eliminare l'elemento?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Sblocco biometrico per questo account disabilitato in attesa della verifica della password principale.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Dati biometrici modificati, accedi con la password principale per attivare nuovamente lo sblocco con dati biometrici.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Sblocco biometrico del riempimento automatico per questo account disabilitato in attesa della verifica della password principale.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Sblocco biometrico per riempimento automatico disabilitato in attesa della verifica della password principale.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Gesto di sincronizzazione</value>
@@ -1782,7 +1782,7 @@
    <value>Per completare l'accesso con SSO, imposta una password principale per accedere e proteggere la cassaforte.</value>
  </data>
  <data name="MasterPasswordPolicyInEffect" xml:space="preserve">
-    <value>Una o più politiche dell'organizzazione richiedono che la tua password principale soddisfi questi requisiti:</value>
+    <value>La password principale deve avere i seguenti requisiti, stabiliti dalle politiche dell'organizzazione:</value>
  </data>
  <data name="PolicyInEffectMinComplexity" xml:space="preserve">
    <value>Punteggio minimo di complessità {0}</value>
@@ -1816,7 +1816,7 @@
 </value>
  </data>
  <data name="AcceptPoliciesError" xml:space="preserve">
-    <value>I Termini di Servizio e l'Informativa sulla Privacy non sono stati accettati.</value>
+    <value>I termini di servizio e l'informativa sulla privacy non sono stati accettati.</value>
  </data>
  <data name="TermsOfService" xml:space="preserve">
    <value>Termini di Servizio</value>
@@ -1825,7 +1825,7 @@
    <value>Informativa sulla Privacy</value>
  </data>
  <data name="AccessibilityDrawOverPermissionAlert" xml:space="preserve">
-    <value>Bitwarden richiede la tua attenzione - Abilita "Mostra sopra altre app" in "Servizi di riempimento automatico" dalle impostazioni di Bitwarden</value>
+    <value>Bitwarden richiede la tua attenzione - Abilita "Mostra sopra altre app" nelle impostazioni di Bitwarden</value>
  </data>
  <data name="AutofillServices" xml:space="preserve">
    <value>Servizi di riempimento automatico</value>
@@ -1861,7 +1861,7 @@
    <value>Se abilitato, il servizio di accessibilità di Bitwarden mostrerà un pop-up per aiutarti a riempire automaticamente i tuoi login quando selezioni dei campi di login.</value>
  </data>
  <data name="DrawOverDescription3" xml:space="preserve">
-    <value>Se abilitato, l'accessibilità mostrerà un pop-up per migliorare il servizio di riempimento automatico per app più vecchie che non supportano la struttura di riempimento automatico di Android.</value>
+    <value>Se abilitato, l'accessibilità mostrerà un pop-up per migliorare il servizio di riempimento automatico per applicazioni più vecchie che non supportano la struttura di riempimento automatico di Android.</value>
  </data>
  <data name="PersonalOwnershipSubmitError" xml:space="preserve">
    <value>A causa di una politica aziendale, non puoi salvare elementi nella tua cassaforte personale. Cambia l'opzione di proprietà in un'organizzazione e scegli tra le raccolte disponibili.</value>
@@ -1946,7 +1946,7 @@
    <value>Numero massimo di accessi</value>
  </data>
  <data name="MaximumAccessCountInfo" xml:space="preserve">
-    <value>Se impostata, gli utenti non potranno più accedere a questo Send una volta raggiunto il numero massimo di accessi.</value>
+    <value>Se impostata, gli utenti potranno più accedere a questo Send una volta raggiunto il numero massimo di accessi.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="MaximumAccessCountReached" xml:space="preserve">
@@ -1997,7 +1997,7 @@
    <value>Condividi link</value>
  </data>
  <data name="SendLink" xml:space="preserve">
-    <value>Link del Send</value>
+    <value>Collegamento del Send</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SearchSends" xml:space="preserve">
@@ -2066,7 +2066,7 @@
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SendFilePremiumRequired" xml:space="preserve">
-    <value>Gli account gratis sono limitati alla condivisione di testo. Per condividere i file usando Send è necessario un abbonamento Premium.</value>
+    <value>Gli account gratuiti sono limitati alla condivisione di testo. Per condividere i file usando Send è necessario un abbonamento Premium.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SendFileEmailVerificationRequired" xml:space="preserve">
@@ -2074,13 +2074,13 @@
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="PasswordPrompt" xml:space="preserve">
-    <value>Richiedi di inserire la password principale di nuovo per visualizzare questo elemento</value>
+    <value>Nuova richiesta della password principale</value>
  </data>
  <data name="PasswordConfirmation" xml:space="preserve">
    <value>Conferma della password principale</value>
  </data>
  <data name="PasswordConfirmationDesc" xml:space="preserve">
-    <value>Questa azione è protetta. Inserisci la tua password principale di nuovo per verificare la tua identità.</value>
+    <value>Questa azione è protetta. Per continuare, digita nuovamente la tua password principale per verificare la tua identità.</value>
  </data>
  <data name="CaptchaRequired" xml:space="preserve">
    <value>Captcha obbligatorio</value>
@@ -2095,7 +2095,7 @@
    <value>Aggiorna password principale</value>
  </data>
  <data name="UpdateMasterPasswordWarning" xml:space="preserve">
-    <value>La tua password principale è stata recentemente modificata da un amministratore nella tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora.</value>
+    <value>La tua password principale è stata recentemente modificata da un amministratore nella tua organizzazione. Per accedere alla cassaforte, devi aggiornarla ora. Procedendo sarai disconnesso dalla sessione attuale, richiedendo di effettuare nuovamente l'accesso. Le sessioni attive su altri dispositivi possono continuare a rimanere attive per un massimo di un'ora.</value>
  </data>
  <data name="UpdatingPassword" xml:space="preserve">
    <value>Aggiornamento password</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Le politiche della tua organizzazione stanno influenzando il timeout della tua cassaforte. Il tempo massimo consentito è di {0} ore e {1} minuti</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Le politiche della tua organizzazione stanno influenzando il timeout della tua cassaforte. Il tempo massimo consentito è di {0} ore e {1} minuti. La tua azione di timeout della cassaforte è impostata su {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Le politiche della tua organizzazione hanno impostato l'azione di timeout cassaforte su {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Il timeout della tua cassaforte supera i limiti impostati dalla tua organizzazione.</value>
  </data>
@@ -2173,10 +2167,10 @@
    <value>Account bloccato</value>
  </data>
  <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
-    <value>Account uscito</value>
+    <value>Account uscito correttamente</value>
  </data>
  <data name="AccountRemovedSuccessfully" xml:space="preserve">
-    <value>Account rimosso</value>
+    <value>Account rimosso correttamente</value>
  </data>
  <data name="DeleteAccount" xml:space="preserve">
    <value>Elimina account</value>
@@ -2206,7 +2200,7 @@
    <value>Invio in corso</value>
  </data>
  <data name="CopySendLinkOnSave" xml:space="preserve">
-    <value>Copia il link al Send dopo averlo salvato</value>
+    <value>Copia il link al Send dopo averlo salvato.</value>
  </data>
  <data name="SendingCode" xml:space="preserve">
    <value>Invio codice in corso...</value>
@@ -2215,7 +2209,7 @@
    <value>Verifica</value>
  </data>
  <data name="ResendCode" xml:space="preserve">
-    <value>Invia codice di nuovo</value>
+    <value>Invia di nuovo il codice</value>
  </data>
  <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
    <value>Il codice di verifica è stato inviato al tuo indirizzo email</value>
@@ -2473,7 +2467,7 @@ clicca Aggiungi TOTP per salvare la chiave in modo sicuro</value>
    <value>Ulteriori informazioni sul servizio di accessibilità</value>
  </data>
  <data name="AccessibilityDisclosureText" xml:space="preserve">
-    <value>Bitwarden usa il servizio di accessibilità per cercare i campi di login in app e siti web e individuare gli ID di campo appropriati per inserire nome utente e password quando è trovata una corrispondenza per il sito o l'app. Non memorizziamo nessuna delle informazioni che ci soono presentate dal servizio, e non controlliamo eventuali altri elementi sullo schermo diversi dall'immissione di credenziali.</value>
+    <value>Bitwarden usa il servizio di accessibilità per cercare i campi di login in app e siti web e individuare gli ID di campo appropriati per inserire nome utente e password quando è trovata una corrispondenza per il sito o l'app. Non memorizziamo nessuna delle informazioni che ci vengono presentate dal servizio, e non controlliamo eventuali altri elementi sullo schermo diversi dall'immissione di credenziali.</value>
  </data>
  <data name="Accept" xml:space="preserve">
    <value>Accetta</value>
@@ -2495,8 +2489,8 @@ Vuoi passare a questo account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Ottieni suggerimento per la password principale</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Accedendo come {0} su {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Accedendo come</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Non sei tu?</value>
@@ -2517,7 +2511,7 @@ Vuoi passare a questo account?</value>
    <value>Assicurati che la tua cassaforte sia sbloccata e che la frase impronta corrisponda sull'altro dispositivo.</value>
  </data>
  <data name="ResendNotification" xml:space="preserve">
-    <value>Invia notifica di nuovo</value>
+    <value>Invia nuova notifica</value>
  </data>
  <data name="NeedAnotherOption" xml:space="preserve">
    <value>Hai bisogno di un'altra opzione?</value>
@@ -2609,25 +2603,4 @@ Vuoi passare a questo account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Nessun elemento corrisponde alla ricerca</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Area dati</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regione</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>La tua password principale non soddisfa uno o più politiche della tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Password principale corrente</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ja.resx
+++ b/src/App/Resources/AppResources.ja.resx
@@ -1752,11 +1752,11 @@
    <value>本当にごみ箱に入れますか？</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>このアカウントの生体認証ロック解除はマスターパスワードの検証待ちで無効になっています。</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>生体認証の変更が検出されました。マスターパスワードを使用してログインすると再度有効化できます。</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>このアカウントの自動入力の生体認証ロック解除はマスターパスワードの検証待ちで無効になっています。</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>マスターパスワードの検証保留中は生体認証でのロック解除は無効化されています</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>更新時に同期を有効化</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>組織のポリシーが保管庫のタイムアウトに影響を与えています。保管庫のタイムアウトは {0} 時間 {1} 分です。</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>組織のポリシーがデータ保管庫のタイムアウトに影響しています。保管庫のタイムアウトの最大許容値は、{0}時間{1}分です。保管庫タイムアウト時のアクションは、{2}に設定されています。</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>組織のポリシーで保管庫のタイムアウトアクションが{0}に設定されています。</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>保管庫のタイムアウトが組織によって設定された制限を超えています。</value>
  </data>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>マスターパスワードのヒントを取得する</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} で {0} としてログイン</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} としてログイン</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>あなたではないですか？</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>検索に一致するアイテムはありません</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>米国</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>自己ホスト型</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>データのリージョン</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>リージョン</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>マスターパスワードが組織のポリシーに適合していません。保管庫にアクセスするには、今すぐマスターパスワードを更新しなければなりません。続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイス上のアクティブなセッションは、最大1時間アクティブであり続けることがあります。</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>現在のマスターパスワード</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ka.resx
+++ b/src/App/Resources/AppResources.ka.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.kn.resx
+++ b/src/App/Resources/AppResources.kn.resx
@@ -1753,11 +1753,11 @@ Scanning will happen automatically.</value>
    <value>ನೀವು ನಿಜವಾಗಿಯೂ ಅನುಪಯುಕ್ತಕ್ಕೆ ಕಳುಹಿಸಲು ಬಯಸುವಿರಾ?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>ಬಯೋಮೆಟ್ರಿಕ್ ಅನ್ಲಾಕ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮಾಸ್ಟರ್ ಪಾಸ್ವರ್ಡ್ನ ಪರಿಶೀಲನೆ ಬಾಕಿ ಉಳಿದಿದೆ.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>ಸ್ವಯಂಚಾಲಿತ ಭರ್ತಿಗಾಗಿ ಬಯೋಮೆಟ್ರಿಕ್ ಅನ್ಲಾಕ್ ಮಾಸ್ಟರ್ ಪಾಸ್ವರ್ಡ್ನ ಪರಿಶೀಲನೆ ಬಾಕಿ ಉಳಿದಿದೆ.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>ರಿಫ್ರೆಶ್‌ನಲ್ಲಿ ಸಿಂಕ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -1752,11 +1752,11 @@
    <value>정말로 휴지통으로 이동시킬까요?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>생체인증 변경이 확인되었습니다. 마스터 비밀번호로 로그인해서 다시 활성화 해주세요.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>마스터 비밀번호 인증을 하기 전에는 생체 인식을 사용한 자동 채우기가 비활성화됩니다.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>새로고침할 때 동기화 사용</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>조직 정책이 보관함 제한 시간에 영향을 미치고 있습니다. 최대 허용 보관함 제한 시간은 {0}시간 {1}분입니다</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>볼트 제한 시간이 조직에서 설정한 제한을 초과합니다.</value>
  </data>
@@ -2495,8 +2489,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>마스터 비밀번호 힌트 얻기</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0}(으)로 로그인 중</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>본인이 아닌가요?</value>
@@ -2609,25 +2603,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>검색어와 일치하는 항목이 없습니다</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.lt.resx
+++ b/src/App/Resources/AppResources.lt.resx
@@ -193,7 +193,7 @@
    <value>Parašykite mums</value>
  </data>
  <data name="EmailUsDescription" xml:space="preserve">
-    <value>Gauti pagalbos ar palikti atsiliepimą - parašykite el. laišką.</value>
+    <value>Gauti pagalbos ar palikti atsiliepimą - parašykute el. laišką.</value>
  </data>
  <data name="EnterPIN" xml:space="preserve">
    <value>Įveskite PIN kodą.</value>
@@ -219,7 +219,7 @@
    <value>Naujas aplankas sukurtas.</value>
  </data>
  <data name="FolderDeleted" xml:space="preserve">
-    <value>Aplankas ištrintas.</value>
+    <value>Katalogas ištrintas.</value>
  </data>
  <data name="FolderNone" xml:space="preserve">
    <value>Be aplanko</value>
@@ -243,7 +243,7 @@
    <comment>Hide a secret value that is currently shown (password).</comment>
  </data>
  <data name="InternetConnectionRequiredMessage" xml:space="preserve">
-    <value>Prisijunkite prie interneto, kad tęsti toliau.</value>
+    <value>Prisijunkite prie interneto kad tęsti toliau.</value>
    <comment>Description message for the alert when internet connection is required to continue.</comment>
  </data>
  <data name="InternetConnectionRequiredTitle" xml:space="preserve">
@@ -1752,11 +1752,11 @@ Nuskaitymas vyks automatiškai.</value>
    <value>Ar tikrai norite perkelti į šiukšlinę?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrinis atrakinimas išjungtas, kol bus patvirtintas pagrindinis slaptažodis.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrinis automatinio pildymo atrakinimas išjungtas, kol bus patvirtintas pagrindinis slaptažodis.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Leisti sinchronizuoti atnaujinant</value>
@@ -2143,12 +2143,6 @@ Nuskaitymas vyks automatiškai.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Jūsų organizacijos politika turi įtakos saugyklos skirtajam laikui. Didžiausias leistinas saugyklos skirtasis laikas yra {0} valanda (-os) ir {1} minutė (-ės)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Jūsų organizacijos nustatymai apriboja jūsų saugyklos neaktyvumo laiko nustatymus. Maksimalus leidžiamas saugyklos neaktyvumo laikas yra {0} valanda(-os) ir {1} minutė(s). Jūsų saugyklos neaktyvumo laikas yra nustatytas {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Jūsų organizacija nustatė saugyklos neaktyvumo trukmę {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Jūsų saugyklos skirtasis laikas viršija jūsų organizacijos nustatytus apribojimus.</value>
  </data>
@@ -2496,8 +2490,8 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Gauti pagrindinio slaptažodžio užuominą</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prisijungiama kaip {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ne jūs?</value>
@@ -2610,25 +2604,4 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Elementų, atitinkančių paiešką, nėra</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Jūsų pagrindinis slaptažodis neatitinka vieno ar kelių organizacijos slaptažodžiui keliamų reikalavimų. Norėdami prisijungti prie saugyklos, jūs turite atnaujinti savo pagrindinį slaptažodį. Jeigu nuspręsite tęsti, jūs būsite atjungti nuo dabartinės sesijos ir jums reikės vėl prisijungti. Visos aktyvios sesijos kituose įrenginiuose gali išlikti aktyvios iki vienos valandos.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Dabartinis pagrindinis slaptažodis</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.lv.resx
+++ b/src/App/Resources/AppResources.lv.resx
@@ -1752,10 +1752,10 @@ Nolasīšana notiks automātiski.</value>
    <value>Vai tiešām vēlaties sūtīt uz atkritni?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Šī konta atslēgšana ar biometriju ir atspējota, tiek gaidīts galvenās paroles apstiprinājums.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Atslēgšana ar biometriju ir atspējota, tiek gaidīts galvenās paroles apstiprinājums.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
    <value>Automātiskās aizpildes atslēgšana ar biometriju ir atspējota, tiek gaidīts galvenās paroles apstiprinājums.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
@@ -2142,12 +2142,6 @@ Nolasīšana notiks automātiski.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Apvienības nosacījumi ietekmē glabātavas noildzi. Lielākā atļautā glabātavas noildze ir {0} stunda(s) un {1} minūte(s)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Apvienības nosacījumi ietekmē glabātavas noildzi. Lielākā atļautā glabātavas noildze ir {0} stunda(s) un {1} minūte(s). Kā glabātavas noildzes darbība ir uzstādīta {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Apvienības nosacījumos kā glabātavas noildzes darbība ir uzstādīta {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Glabātavas noildze pārsniedz apvienības uzstādītos ierobežojumus.</value>
  </data>
@@ -2495,8 +2489,8 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Saņemt galvenās paroles norādi</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Piesakās {1} kā {0}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Piesakās kā {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Tas neesi Tu?</value>
@@ -2609,25 +2603,4 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Nav vienumu, kas atbilstu meklējumam</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>ASV</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ES</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Pašizvietots</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Datu apgabals</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Apgabals</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Galvenā parole neatbilst vienam vai vairākiem apvienības nosacījumiem. Ir jāatjaunina galvenā parole, lai varētu piekļūt glabātavai. Turpinot notiks atteikšanās no pašreizējās sesijas, un būs nepieciešams pieteikties no jauna. Citās ierīcēs esošās sesijas var turpināt darboties līdz vienai stundai.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Pašreizējā galvenā parole</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ml.resx
+++ b/src/App/Resources/AppResources.ml.resx
@@ -276,7 +276,7 @@
    <value>നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?</value>
  </data>
  <data name="RemoveAccount" xml:space="preserve">
-    <value>അക്കൗണ്ട് നീക്കംചെയ്യുക</value>
+    <value>Remove account</value>
  </data>
  <data name="RemoveAccountConfirmation" xml:space="preserve">
    <value>Are you sure you want to remove this account?</value>
@@ -584,7 +584,7 @@
    <value>നിങ്ങളുടെ പാസ്‌വേഡ് മറന്നാൽ അത് ഓർമ്മിക്കാൻ ഒരു പ്രാഥമിക പാസ്‌വേഡ് സൂചന സഹായിക്കും.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>പ്രാഥമിക പാസ്‌വേഡിന് കുറഞ്ഞത് {0} പ്രതീകങ്ങളെങ്കിലും ദൈർഘ്യമുണ്ടായിരിക്കണം.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>കുറഞ്ഞ സംഖ്യകൾ</value>
@@ -775,10 +775,10 @@
    <value>പ്രവർത്തനക്ഷമമാക്കി</value>
  </data>
  <data name="Off" xml:space="preserve">
-    <value>ഓഫ്</value>
+    <value>Off</value>
  </data>
  <data name="On" xml:space="preserve">
-    <value>ഓൺ</value>
+    <value>On</value>
  </data>
  <data name="Status" xml:space="preserve">
    <value>അവസ്ഥ</value>
@@ -900,8 +900,8 @@
    <value>ഓതന്റിക്കേറ്റർ കീ വായിക്കാൻ കഴിയുന്നില്ല.</value>
  </data>
  <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>നിങ്ങളുടെ ക്യാമറ QR കോഡിലേക്ക് ചൂണ്ടുക.
-സ്കാനിംഗ് സ്വയമേവ നടക്കും.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
  </data>
  <data name="ScanQrTitle" xml:space="preserve">
    <value>QR കോഡ് സ്കാൻ ചെയ്യുക</value>
@@ -1080,7 +1080,7 @@
    <value>പേരിന്റെ അവസാന ഭാഗം</value>
  </data>
  <data name="FullName" xml:space="preserve">
-    <value>പൂര്‍ണ്ണമായ പേര്</value>
+    <value>Full name</value>
  </data>
  <data name="LicenseNumber" xml:space="preserve">
    <value>ലൈസൻസ് നമ്പർ</value>
@@ -1210,7 +1210,7 @@
    <value>മറച്ചത്</value>
  </data>
  <data name="FieldTypeLinked" xml:space="preserve">
-    <value>ബന്ധിപ്പിച്ചത്</value>
+    <value>Linked</value>
  </data>
  <data name="FieldTypeText" xml:space="preserve">
    <value>വാചകം</value>
@@ -1384,10 +1384,10 @@
    <value>കളക്ഷനുകൾ  തിരയുക</value>
  </data>
  <data name="SearchFileSends" xml:space="preserve">
-    <value>അയച്ച വാക്കുകൾ തിരയുക</value>
+    <value>Search file Sends</value>
  </data>
  <data name="SearchTextSends" xml:space="preserve">
-    <value>അയച്ച വാക്കുകൾ തിരയുക</value>
+    <value>Search text Sends</value>
  </data>
  <data name="SearchGroup" xml:space="preserve">
    <value>Search {0}</value>
@@ -1662,10 +1662,10 @@
    <value>Send a verification code to your email</value>
  </data>
  <data name="CodeSent" xml:space="preserve">
-    <value>കോഡ് അയച്ചു!</value>
+    <value>Code sent!</value>
  </data>
  <data name="ConfirmYourIdentity" xml:space="preserve">
-    <value>തുടരാൻ നിങ്ങളുടെ ഐഡന്റിറ്റി സ്ഥിരീകരിക്കുക.</value>
+    <value>Confirm your identity to continue.</value>
  </data>
  <data name="ExportVaultWarning" xml:space="preserve">
    <value>ഈ എക്‌സ്‌പോർട്ടിൽ എൻക്രിപ്റ്റ് ചെയ്യാത്ത ഫോർമാറ്റിൽ നിങ്ങളുടെ വാൾട് ഡാറ്റ അടങ്ങിയിരിക്കുന്നു. എക്‌സ്‌പോർട് ചെയ്ത ഫയൽ സുരക്ഷിതമല്ലാത്ത ചാനലുകളിൽ (ഇമെയിൽ പോലുള്ളവ) നിങ്ങൾ സംഭരിക്കുകയോ അയയ്ക്കുകയോ ചെയ്യരുത്. നിങ്ങൾ ഇത് ഉപയോഗിച്ചുകഴിഞ്ഞാലുടൻ അത് മായ്ച്ചുകളയണം.</value>
@@ -1752,11 +1752,11 @@
    <value>ട്രാഷിലേക്ക് അയയ്‌ക്കാൻ നിങ്ങൾ ശരിക്കും ആഗ്രഹിക്കുന്നുണ്ടോ?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>റിഫ്രഷ് ചെയ്യുമ്പോൾ സമന്വയം പ്രാപ്തമാക്കുക</value>
@@ -1886,7 +1886,7 @@
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="Text" xml:space="preserve">
-    <value>വാചകം</value>
+    <value>Text</value>
  </data>
  <data name="TypeText" xml:space="preserve">
    <value>വാചകം</value>
@@ -1905,13 +1905,13 @@
    <value>നിങ്ങൾ അയയ്ക്കാൻ ആഗ്രഹിക്കുന്ന ഫയൽ.</value>
  </data>
  <data name="FileTypeIsSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തു.</value>
+    <value>File type is selected.</value>
  </data>
  <data name="FileTypeIsNotSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തിട്ടില്ല, തിരഞ്ഞെടുക്കാൻ ടാപ്പുചെയ്യുക.</value>
+    <value>File type is not selected, tap to select.</value>
  </data>
  <data name="TextTypeIsSelected" xml:space="preserve">
-    <value>ഫയൽ തരം തിരഞ്ഞെടുത്തു.</value>
+    <value>Text type is selected.</value>
  </data>
  <data name="TextTypeIsNotSelected" xml:space="preserve">
    <value>Text type is not selected, tap to select.</value>
@@ -1927,7 +1927,7 @@
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="PendingDelete" xml:space="preserve">
-    <value>പരിപൂർണ്ണമാവാത്ത ഇല്ലാതാക്കൽ</value>
+    <value>Pending deletion</value>
  </data>
  <data name="ExpirationDate" xml:space="preserve">
    <value>കാലഹരണപ്പെടുന്ന തീയതി</value>
@@ -2140,13 +2140,7 @@
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2495,8 +2489,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2609,25 +2603,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.my.resx
+++ b/src/App/Resources/AppResources.my.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.nb.resx
+++ b/src/App/Resources/AppResources.nb.resx
@@ -1752,11 +1752,11 @@ Skanning skjer automatisk.</value>
    <value>Vil du virkelig sende til papirkurven?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrisk opplåsing er deaktivert under påvente av hovedpassord.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrisk opplåsing for autofyll deaktivert i påvente av verifisering av hovedpassord.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Aktiver synkronisering ved oppdatering</value>
@@ -2143,12 +2143,6 @@ Skanning skjer automatisk.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Din organisasjons vikår påvirker tidsavbruddet for hvelvet. Maksimalt tillatt tidsavbrudd for hvelv er {0} time(r) og {1} minutt(er)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Tidsavbruddet ditt for hvelvet overstiger begrensningene som er satt av organisasjonen din.</value>
  </data>
@@ -2496,8 +2490,8 @@ Vil du bytte til denne kontoen?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Få et hint om hovedpassordet</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger inn som {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ikke du?</value>
@@ -2610,25 +2604,4 @@ Vil du bytte til denne kontoen?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Det er ingen elementer som samsvarer med søket</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Nåværende hovedpassord</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ne.resx
+++ b/src/App/Resources/AppResources.ne.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.nl.resx
+++ b/src/App/Resources/AppResources.nl.resx
@@ -584,7 +584,7 @@
    <value>Een hoofdwachtwoordhint kan je helpen je wachtwoord te herinneren als je het vergeten bent.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Hoofdwachtwoord moet minstens {0} karakters lang zijn.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Min. aantal cijfers</value>
@@ -1752,11 +1752,11 @@ Het scannen gebeurt automatisch.</value>
    <value>Weet je zeker dat je dit naar de prullenbak wilt verplaatsen?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometrische ontgrendeling voor deze account is uitgeschakeld in afwachting van verificatie van het hoofdwachtwoord.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrische ontgrendeling uitgeschakeld in afwachting van verificatie van het hoofdwachtwoord.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Automatische biometrische ontgrendeling voor deze account is uitgeschakeld in afwachting van verificatie van het hoofdwachtwoord.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrische ontgrendeling is uitgeschakeld in afwachting van verificatie van het hoofdwachtwoord.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Synchronisatie bij vernieuwen inschakelen</value>
@@ -2142,12 +2142,6 @@ Het scannen gebeurt automatisch.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Het beleid van je organisatie heeft invloed op de time-out van je kluis. De maximaal toegestane kluis time-out is {0} uur en {1} minuten</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>De beleidsinstellingen van je organisatie hebben invloed op de time-out van je kluis. De maximale toegestane kluis time-out is {0} uur en {1} minuten. Jouw time-out is ingesteld op {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>De beleidsinstellingen van je organisatie hebben je kluis time-out ingesteld op {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Je kluis time-out is hoger dan het maximum van jouw organisatie.</value>
  </data>
@@ -2495,8 +2489,8 @@ Wilt u naar dit account wisselen?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Hoofdwachtwoordhint krijgen</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Inloggen als {0} op {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Inloggen als {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Ben jij dit niet?</value>
@@ -2609,25 +2603,4 @@ Wilt u naar dit account wisselen?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Er zijn geen items die overeenkomen met de zoekopdracht</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Zelfgehost</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregio</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Regio</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Je hoofdwachtwoord voldoet niet aan en of meerdere oganisatiebeleidsonderdelen. Om toegang te krijgen tot de kluis, moet je je hoofdwachtwoord nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Huidig hoofdwachtwoord</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.nn.resx
+++ b/src/App/Resources/AppResources.nn.resx
@@ -425,7 +425,7 @@
    <value>Sjølvutfyllingsteneste</value>
  </data>
  <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>Unngå forvekslingsbare teikn</value>
+    <value>Avoid ambiguous characters</value>
  </data>
  <data name="BitwardenAppExtension" xml:space="preserve">
    <value>Bitwarden App-utviding</value>
@@ -584,7 +584,7 @@
    <value>Eit hovudpassordvink kan hjelpa deg med å hugsa passordet ditt om du gløymer det.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Hovudpassordet ditt må vera minst {0} teikn langt.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Min. tal på nummer</value>
@@ -660,7 +660,7 @@
    <value>Lag om passord</value>
  </data>
  <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>Skriv inn hovudpassordet på nytt</value>
+    <value>Re-type master password</value>
  </data>
  <data name="SearchVault" xml:space="preserve">
    <value>Leita i kvelvet</value>
@@ -684,7 +684,7 @@
    <value>Oppføringa er retta.</value>
  </data>
  <data name="Submitting" xml:space="preserve">
-    <value>Sender inn...</value>
+    <value>Submitting...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Syncing" xml:space="preserve">
@@ -811,7 +811,7 @@
    <value>Lær om samskipnader</value>
  </data>
  <data name="CannotOpenApp" xml:space="preserve">
-    <value>Kan ikkje opne appen "{0}".</value>
+    <value>Cannot open the app "{0}".</value>
    <comment>Message shown when trying to launch an app that does not exist on the user's device.</comment>
  </data>
  <data name="AuthenticatorAppTitle" xml:space="preserve">
@@ -834,7 +834,7 @@
    <value>This account has two-step login set up, however, none of the configured two-step providers are supported on this device. Please use a supported device and/or add additional providers that are better supported across devices (such as an authenticator app).</value>
  </data>
  <data name="RecoveryCodeTitle" xml:space="preserve">
-    <value>Gjenopprettingskode</value>
+    <value>Recovery code</value>
    <comment>For 2FA</comment>
  </data>
  <data name="RememberMe" xml:space="preserve">
@@ -842,11 +842,11 @@
    <comment>Remember my two-step login</comment>
  </data>
  <data name="SendVerificationCodeAgain" xml:space="preserve">
-    <value>Send e-post om stadfestingskode på nytt</value>
+    <value>Send verification code email again</value>
    <comment>For 2FA</comment>
  </data>
  <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Alternativ for totrinnsinnlogging</value>
+    <value>Two-step login options</value>
  </data>
  <data name="UseAnotherTwoStepMethod" xml:space="preserve">
    <value>Use another two-step login method</value>
@@ -863,17 +863,17 @@
    <value>To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device's USB port, then touch its button.</value>
  </data>
  <data name="YubiKeyTitle" xml:space="preserve">
-    <value>YubiKey sikkerheitsnøkkel</value>
+    <value>YubiKey security key</value>
    <comment>"YubiKey" is the product name and should not be translated.</comment>
  </data>
  <data name="AddNewAttachment" xml:space="preserve">
-    <value>Legg til nytt vedlegg</value>
+    <value>Add new attachment</value>
  </data>
  <data name="Attachments" xml:space="preserve">
-    <value>Vedlegg</value>
+    <value>Attachments</value>
  </data>
  <data name="UnableToDownloadFile" xml:space="preserve">
-    <value>Kunne ikkje laste ned fila.</value>
+    <value>Unable to download file.</value>
  </data>
  <data name="UnableToOpenFile" xml:space="preserve">
    <value>Eininga di kan ikkje opna denne filtypen.</value>
@@ -900,8 +900,8 @@
    <value>Kan ikkje lesa autentiseringsnykel.</value>
  </data>
  <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>Peik kameraet ditt mot QR-koden.
-Skanning skjer automatisk.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
  </data>
  <data name="ScanQrTitle" xml:space="preserve">
    <value>Skann QR-kode</value>
@@ -919,7 +919,7 @@ Skanning skjer automatisk.</value>
    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
  </data>
  <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Kopier TOTP-en automatisk</value>
+    <value>Copy TOTP automatically</value>
  </data>
  <data name="PremiumRequired" xml:space="preserve">
    <value>Ei Premium-tinging er påkravd for å bruka denne funksjonen.</value>
@@ -974,7 +974,7 @@ Skanning skjer automatisk.</value>
    <comment>Validation error when something is not formatted correctly, such as a URL or email address.</comment>
  </data>
  <data name="IdentityUrl" xml:space="preserve">
-    <value>URL for identitetstenar</value>
+    <value>Identity server URL</value>
    <comment>"Identity" refers to an identity server. See more context here https://en.wikipedia.org/wiki/Identity_management</comment>
  </data>
  <data name="SelfHostedEnvironment" xml:space="preserve">
@@ -993,7 +993,7 @@ Skanning skjer automatisk.</value>
    <value>Trykk på denne meldinga for å sjå oppføringar i kvelvet ditt.</value>
  </data>
  <data name="CustomFields" xml:space="preserve">
-    <value>Eigendefinerte felt</value>
+    <value>Custom fields</value>
  </data>
  <data name="CopyNumber" xml:space="preserve">
    <value>Skriv av nummer</value>
@@ -1056,10 +1056,10 @@ Skanning skjer automatisk.</value>
    <value>Dr.</value>
  </data>
  <data name="ExpirationMonth" xml:space="preserve">
-    <value>Utlaupsmånad</value>
+    <value>Expiration month</value>
  </data>
  <data name="ExpirationYear" xml:space="preserve">
-    <value>Utlaupsår</value>
+    <value>Expiration year</value>
  </data>
  <data name="February" xml:space="preserve">
    <value>Februar</value>
@@ -1083,7 +1083,7 @@ Skanning skjer automatisk.</value>
    <value>Fullt namn</value>
  </data>
  <data name="LicenseNumber" xml:space="preserve">
-    <value>Førarkortnummer</value>
+    <value>License number</value>
  </data>
  <data name="March" xml:space="preserve">
    <value>Mars</value>
@@ -1137,10 +1137,10 @@ Skanning skjer automatisk.</value>
    <value>Adresse</value>
  </data>
  <data name="Expiration" xml:space="preserve">
-    <value>Utlaup</value>
+    <value>Expiration</value>
  </data>
  <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Vis nettstadikon</value>
+    <value>Show website icons</value>
  </data>
  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
    <value>Show a recognizable image next to each login.</value>
@@ -1149,16 +1149,16 @@ Skanning skjer automatisk.</value>
    <value>Icons server URL</value>
  </data>
  <data name="AutofillWithBitwarden" xml:space="preserve">
-    <value>Auto-utfyll med Bitwarden</value>
+    <value>Auto-fill with Bitwarden</value>
  </data>
  <data name="VaultIsLocked" xml:space="preserve">
    <value>Kvelvet er låst</value>
  </data>
  <data name="GoToMyVault" xml:space="preserve">
-    <value>Gå til kvelvet mitt</value>
+    <value>Go to my vault</value>
  </data>
  <data name="Collections" xml:space="preserve">
-    <value>Samlingar</value>
+    <value>Collections</value>
  </data>
  <data name="NoItemsCollection" xml:space="preserve">
    <value>Det er ingen oppføringar i denne samlinga.</value>
@@ -1186,13 +1186,13 @@ Skanning skjer automatisk.</value>
    <comment>What Apple calls their facial recognition reader.</comment>
  </data>
  <data name="FaceIDDirection" xml:space="preserve">
-    <value>Bruk Face ID for å stadfeste.</value>
+    <value>Use Face ID to verify.</value>
  </data>
  <data name="UseFaceIDToUnlock" xml:space="preserve">
-    <value>Bruk Face ID til å låse opp</value>
+    <value>Use Face ID To Unlock</value>
  </data>
  <data name="VerifyFaceID" xml:space="preserve">
-    <value>Stadfest Face ID</value>
+    <value>Verify Face ID</value>
  </data>
  <data name="WindowsHello" xml:space="preserve">
    <value>Windows Hello</value>
@@ -1752,11 +1752,11 @@ Skanning skjer automatisk.</value>
    <value>Vil du verkeleg flytta denne til papirkorga?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Skanning skjer automatisk.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Avbrotet frå kvelvet ditt skrid over det avgrensingane fastsette av samskipnaden din.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Loggar inn som {0} på {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dataregion</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.or.resx
+++ b/src/App/Resources/AppResources.or.resx
--- a/src/App/Resources/AppResources.pl.resx
+++ b/src/App/Resources/AppResources.pl.resx
@@ -1752,11 +1752,11 @@ Skanowanie nastąpi automatycznie.</value>
    <value>Czy na pewno chcesz to usunąć?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Odblokowanie biometryczne dla tego konta jest wyłączone w oczekiwaniu na weryfikację hasła głównego.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Odblokowanie za pomocą danych biometrycznych zostało wyłączone. Zaloguj się hasłem głównym.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autouzupełnianie za pomocą danych biometrycznych zostało wyłączone w oczekiwaniu na weryfikację hasła głównego.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Autouzupełnianie za pomocą danych biometrycznych zostało wyłączone. Zaloguj się hasłem głównym.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Włącz synchronizację podczas odświeżenia</value>
@@ -2140,13 +2140,7 @@ Skanowanie nastąpi automatycznie.</value>
    <value>Ta organizacja posługuje się zasadą, która automatycznie rejestruje użytkowników do resetowania hasła. Rejestracja umożliwia administratorom organizacji zmianę Twojego hasła głównego.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Zasady organizacji mają wpływ na czas blokowania sejfu. Maksymalny dozwolony czas wynosi {0} godz. i {1} min.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Zasady organizacji mają wpływ na czas blokowania sejfu. Maksymalny dozwolony czas wynosi {0} godz. i {1} min. Twój czas blokowania sejfu to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Zasady organizacji ustawiły czas blokowania sejfu na {0}.</value>
+    <value>Zasady organizacji mają wpływ czas blokowania sejfu. Maksymalny dozwolony czas wynosi {0} godz. i {1} min.</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Czas blokowania sejfu przekracza limit określony przez organizację.</value>
@@ -2495,8 +2489,8 @@ Czy chcesz przełączyć się na to konto?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Uzyskaj podpowiedź hasła głównego</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logowanie jako {0} do {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logowanie jako {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>To nie Ty?</value>
@@ -2609,25 +2603,4 @@ Czy chcesz przełączyć się na to konto?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Brak elementów, które pasują do wyszukiwania</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Samodzielnie hostowany</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Region danych</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Twoje hasło główne nie spełnia jednej lub kilku zasad organizacji. Aby uzyskać dostęp do sejfu, musisz teraz zaktualizować swoje hasło główne. Kontynuacja wyloguje Cię z bieżącej sesji, wymagając zalogowania się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie jedną godzinę.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Aktualne hasło główne</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.pt-BR.resx
+++ b/src/App/Resources/AppResources.pt-BR.resx
@@ -1752,11 +1752,11 @@ A leitura será feita automaticamente.</value>
    <value>Você realmente quer enviar para a lixeira?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>O desbloqueio biométrico desta conta está desabilitado com a verificação da senha mestra.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>O desbloqueio biométrico está desativado, faça o login usando a Senha Mestra para ativar novamente.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>O desbloqueio biométrico do autopreenchimento está desabilitado para esta conta por pendência de verificação da senha mestra.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>O desbloqueio biométrico para autopreenchimento está desativado, faça o login usando a Senha Mestra para ativar novamente.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Ativar sincronização ao atualizar</value>
@@ -2143,12 +2143,6 @@ A leitura será feita automaticamente.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é {0} hora(s) e {1} minuto(s)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é {0} hora(s) e {1} minuto(s). Seu tempo limite do cofre está definido em {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>As políticas da sua organização definiram a ação tempo limite do seu cofre para {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>O tempo limite do seu cofre excede as restrições definidas por sua organização.</value>
  </data>
@@ -2496,8 +2490,8 @@ Você deseja mudar para esta conta?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obter dica da senha mestra</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Entrando como {0} em {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Entrando como {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Não é você?</value>
@@ -2610,25 +2604,4 @@ Você deseja mudar para esta conta?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Não há itens que correspondam à pesquisa</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Europa</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Auto-hospedado</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Região de dados</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Região</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Senha mestra atual</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.pt-PT.resx
+++ b/src/App/Resources/AppResources.pt-PT.resx
@@ -186,11 +186,11 @@
    <comment>Short label for an email address.</comment>
  </data>
  <data name="EmailAddress" xml:space="preserve">
-    <value>Endereço de e-mail</value>
+    <value>Endereço de email</value>
    <comment>Full label for a email address.</comment>
  </data>
  <data name="EmailUs" xml:space="preserve">
-    <value>Enviar-nos um e-mail</value>
+    <value>Enviar-nos um email</value>
  </data>
  <data name="EmailUsDescription" xml:space="preserve">
    <value>Envie-nos um email diretamente para obter ajuda ou deixar feedback.</value>
@@ -203,7 +203,7 @@
    <comment>Title for your favorite items in the vault.</comment>
  </data>
  <data name="FileBugReport" xml:space="preserve">
-    <value>Apresentar um relatório de erros</value>
+    <value>Submeter um relatório de bug</value>
  </data>
  <data name="FileBugReportDescription" xml:space="preserve">
    <value>Abrir um issue no nosso repositório do GitHub.</value>
@@ -222,17 +222,17 @@
    <value>Pasta eliminada.</value>
  </data>
  <data name="FolderNone" xml:space="preserve">
-    <value>Em nenhuma pasta</value>
+    <value>Nenhuma pasta</value>
    <comment>Items that have no folder specified go in this special "catch-all" folder.</comment>
  </data>
  <data name="Folders" xml:space="preserve">
    <value>Pastas</value>
  </data>
  <data name="FolderUpdated" xml:space="preserve">
-    <value>Pasta guardada</value>
+    <value>Pasta atualizada.</value>
  </data>
  <data name="GoToWebsite" xml:space="preserve">
-    <value>Ir para o site</value>
+    <value>Ir para o website</value>
    <comment>The button text that allows user to launch the website to their web browser.</comment>
  </data>
  <data name="HelpAndFeedback" xml:space="preserve">
@@ -247,7 +247,7 @@
    <comment>Description message for the alert when internet connection is required to continue.</comment>
  </data>
  <data name="InternetConnectionRequiredTitle" xml:space="preserve">
-    <value>Ligação à Internet necessária</value>
+    <value>Ligação à internet necessária</value>
    <comment>Title for the alert when internet connection is required to continue.</comment>
  </data>
  <data name="InvalidMasterPassword" xml:space="preserve">
@@ -276,13 +276,13 @@
    <value>Tem a certeza de que pretende terminar sessão?</value>
  </data>
  <data name="RemoveAccount" xml:space="preserve">
-    <value>Remover conta</value>
+    <value>Remover Conta</value>
  </data>
  <data name="RemoveAccountConfirmation" xml:space="preserve">
    <value>Tem a certeza de que deseja remover esta conta?</value>
  </data>
  <data name="AccountAlreadyAdded" xml:space="preserve">
-    <value>Conta já adicionada</value>
+    <value>Conta Já Adicionada</value>
  </data>
  <data name="SwitchToAlreadyAddedAccountConfirmation" xml:space="preserve">
    <value>Gostaria de alterar para a adicionada agora?</value>
@@ -296,11 +296,11 @@
    <comment>Text to define that there are more options things to see.</comment>
  </data>
  <data name="MyVault" xml:space="preserve">
-    <value>O meu cofre</value>
+    <value>O meu Cofre</value>
    <comment>The title for the vault page.</comment>
  </data>
  <data name="Authenticator" xml:space="preserve">
-    <value>Autenticador</value>
+    <value>Authenticator</value>
    <comment>Authenticator TOTP feature</comment>
  </data>
  <data name="Name" xml:space="preserve">
@@ -327,7 +327,7 @@
    <comment>Button text for a save operation (verb).</comment>
  </data>
  <data name="Move" xml:space="preserve">
-    <value>Mover</value>
+    <value>Move</value>
  </data>
  <data name="Saving" xml:space="preserve">
    <value>A guardar...</value>
@@ -342,7 +342,7 @@
    <comment>Reveal a hidden value (password).</comment>
  </data>
  <data name="ItemDeleted" xml:space="preserve">
-    <value>Item eliminado</value>
+    <value>O item foi eliminado.</value>
    <comment>Confirmation message after successfully deleting a login.</comment>
  </data>
  <data name="Submit" xml:space="preserve">
@@ -364,7 +364,7 @@
    <comment>Label for a uri/url.</comment>
  </data>
  <data name="UseFingerprintToUnlock" xml:space="preserve">
-    <value>Utilizar a impressão digital para desbloquear</value>
+    <value>Utilizar impressão digital para desbloquear</value>
  </data>
  <data name="Username" xml:space="preserve">
    <value>Nome de utilizador</value>
@@ -375,17 +375,17 @@
    <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
  </data>
  <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} copiado(a)</value>
+    <value>{0} foi copiado(a).</value>
    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
  </data>
  <data name="VerifyFingerprint" xml:space="preserve">
-    <value>Verificar a impressão digital</value>
+    <value>Verificar impressão digital</value>
  </data>
  <data name="VerifyMasterPassword" xml:space="preserve">
-    <value>Verificar a palavra-passe mestra</value>
+    <value>Verificar palavra-passe mestra</value>
  </data>
  <data name="VerifyPIN" xml:space="preserve">
-    <value>Verificar PIN</value>
+    <value>Verifica PIN</value>
  </data>
  <data name="Version" xml:space="preserve">
    <value>Versão</value>
@@ -394,7 +394,7 @@
    <value>Ver</value>
  </data>
  <data name="VisitOurWebsite" xml:space="preserve">
-    <value>Visite o nosso site</value>
+    <value>Visitar o nosso website</value>
  </data>
  <data name="VisitOurWebsiteDescription" xml:space="preserve">
    <value>Visite o nosso website para obter ajuda, notícias, enviar-nos um email, e/ou saber mais acerca de como utilizar o Bitwarden.</value>
@@ -419,10 +419,10 @@
    <value>Extensão da aplicação</value>
  </data>
  <data name="AutofillAccessibilityDescription" xml:space="preserve">
-    <value>Utilize o serviço de acessibilidade do Bitwarden para preencher automaticamente os seus inícios de sessão em todas as aplicações e na web.</value>
+    <value>Utilize o serviço de acessibilidade do Bitwarden para auto-preencher as suas credencias entre aplicações e a web.</value>
  </data>
  <data name="AutofillService" xml:space="preserve">
-    <value>Serviço de preenchimento automático</value>
+    <value>Serviço de auto-preenchimento</value>
  </data>
  <data name="AvoidAmbiguousCharacters" xml:space="preserve">
    <value>Evitar caracteres ambíguos</value>
@@ -431,19 +431,19 @@
    <value>Extensão da aplicação Bitwarden</value>
  </data>
  <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>A maneira mais fácil de adicionar novos inícios de sessão ao seu cofre é a partir da extensão da aplicação Bitwarden. Saiba mais sobre a utilização da extensão da aplicação Bitwarden ao navegar até ao ecrã "Definições".</value>
+    <value>A maneira mais fácil de adicionar novas credenciais ao seu cofre é a partir da extensão da aplicação Bitwarden. Saiba mais acerca de como utilizar a extensão da aplicação Bitwarden ao navegar para o ecrã de "Definições".</value>
  </data>
  <data name="BitwardenAppExtensionDescription" xml:space="preserve">
-    <value>Utilize o Bitwarden no Safari e noutras aplicações para preencher automaticamente os seus inícios de sessão.</value>
+    <value>Utilize o Bitwarden no Safari e outras aplicações para auto-preencher as suas credenciais.</value>
  </data>
  <data name="BitwardenAutofillService" xml:space="preserve">
-    <value>Serviço de preenchimento automático do Bitwarden</value>
+    <value>Serviço de auto-preenchimento Bitwarden</value>
  </data>
  <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
-    <value>Utilize o serviço de acessibilidade do Bitwarden para preencher automaticamente os seus inícios de sessão.</value>
+    <value>Utilize o serviço de acessibilidade do Bitwarden para auto-preencher as suas credencias.</value>
  </data>
  <data name="ChangeEmail" xml:space="preserve">
-    <value>Alterar e-mail</value>
+    <value>Alterar email</value>
  </data>
  <data name="ChangeEmailConfirmation" xml:space="preserve">
    <value>Pode alterar o seu endereço de email no cofre web bitwarden.com. Pretende visitar o website agora?</value>
@@ -471,19 +471,19 @@
    <value>Editar item</value>
  </data>
  <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>Permitir a sincronização automática</value>
+    <value>Ativar sincronização automática</value>
  </data>
  <data name="EnterEmailForHint" xml:space="preserve">
    <value>Introduza o endereço de email da sua conta para receber a dica da sua palavra-passe mestra.</value>
  </data>
  <data name="ExntesionReenable" xml:space="preserve">
-    <value>Reativar a extensão da aplicação</value>
+    <value>Reativar extensão da aplicação</value>
  </data>
  <data name="ExtensionAlmostDone" xml:space="preserve">
    <value>Quase feito!</value>
  </data>
  <data name="ExtensionEnable" xml:space="preserve">
-    <value>Ativar a extensão da aplicação</value>
+    <value>Ativar extensão da aplicação</value>
  </data>
  <data name="ExtensionInSafari" xml:space="preserve">
    <value>No Safari, encontre o Bitwarden utilizando o ícone de partilha (dica: role para a direita na linha de fundo do menu de partilha).</value>
@@ -581,17 +581,17 @@
    <value>Dica da palavra-passe mestra (opcional)</value>
  </data>
  <data name="MasterPasswordHintDescription" xml:space="preserve">
-    <value>Uma dica da palavra-passe mestra pode ajudá-lo a lembrar-se da sua palavra-passe, caso se esqueça dela.</value>
+    <value>Uma dica da palavra-passe mestra pode ajudar a lembrar-se da sua palavra-passe se a esquecer.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>A palavra-passe mestra deve ter pelo menos {0} caracteres.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Números mínimos</value>
    <comment>Minimum numeric characters for password generator settings</comment>
  </data>
  <data name="MinSpecial" xml:space="preserve">
-    <value>Caracteres especiais minímos</value>
+    <value>Especiais minímos</value>
    <comment>Minimum special characters for password generator settings</comment>
  </data>
  <data name="MoreSettings" xml:space="preserve">
@@ -604,7 +604,7 @@
    <value>Nunca</value>
  </data>
  <data name="NewItemCreated" xml:space="preserve">
-    <value>Item adicionado</value>
+    <value>Novo item criado.</value>
  </data>
  <data name="NoFavorites" xml:space="preserve">
    <value>Não existem favoritos no seu cofre.</value>
@@ -632,7 +632,7 @@
    <value>Outros</value>
  </data>
  <data name="PasswordGenerated" xml:space="preserve">
-    <value>Palavra-passe gerada</value>
+    <value>Palavra-passe gerada.</value>
  </data>
  <data name="PasswordGenerator" xml:space="preserve">
    <value>Gerador de palavras-passe</value>
@@ -647,23 +647,23 @@
    <value>Tem a certeza de que pretende sobreescrever a palavra-passe atual?</value>
  </data>
  <data name="PushNotificationAlert" xml:space="preserve">
-    <value>O Bitwarden mantém o seu cofre sincronizado automaticamente através de notificações push. Para obter a melhor experiência possível, selecione "Permitir" na seguinte mensagem quando lhe for pedido para permitir notificações push.</value>
+    <value>O Bitwarden mantém o seu cofre sincronizado automaticamente utilizando notificações push. Para a melhor experiência possível, por favor selecione "Ok" na seguinte solicitação quando solicitado a ativar notificações push.</value>
    <comment>Push notifications for apple products</comment>
  </data>
  <data name="RateTheApp" xml:space="preserve">
-    <value>Avaliar a aplicação</value>
+    <value>Avalie a aplicação</value>
  </data>
  <data name="RateTheAppDescription" xml:space="preserve">
-    <value>Por favor, considere ajudar-nos com uma boa avaliação!</value>
+    <value>Por favor considere ajudar-nos com uma boa análise!</value>
  </data>
  <data name="RegeneratePassword" xml:space="preserve">
    <value>Regenerar palavra-passe</value>
  </data>
  <data name="RetypeMasterPassword" xml:space="preserve">
-    <value>Reintroduza a palavra-passe mestra</value>
+    <value>Reescreva a palavra-passe mestra</value>
  </data>
  <data name="SearchVault" xml:space="preserve">
-    <value>Procurar no cofre</value>
+    <value>Pesquisar cofre</value>
  </data>
  <data name="Security" xml:space="preserve">
    <value>Segurança</value>
@@ -678,10 +678,10 @@
    <value>Introduza um código PIN de 4 dígitos para desbloquear a aplicação.</value>
  </data>
  <data name="ItemInformation" xml:space="preserve">
-    <value>Informações do item</value>
+    <value>Informação do item</value>
  </data>
  <data name="ItemUpdated" xml:space="preserve">
-    <value>Item guardado</value>
+    <value>Item atualizado.</value>
  </data>
  <data name="Submitting" xml:space="preserve">
    <value>A submeter...</value>
@@ -692,23 +692,23 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="SyncingComplete" xml:space="preserve">
-    <value>Sincronização concluída</value>
+    <value>Sincronização completada.</value>
  </data>
  <data name="SyncingFailed" xml:space="preserve">
-    <value>Falha na sincronização</value>
+    <value>Sincronização falhada.</value>
  </data>
  <data name="SyncVaultNow" xml:space="preserve">
-    <value>Sincronizar o cofre agora</value>
+    <value>Sincronizar cofre agora</value>
  </data>
  <data name="TouchID" xml:space="preserve">
    <value>Touch ID</value>
    <comment>What Apple calls their fingerprint reader.</comment>
  </data>
  <data name="TwoStepLogin" xml:space="preserve">
-    <value>Verificação de dois passos</value>
+    <value>Início de sessão de dois passos</value>
  </data>
  <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>A verificação de dois passos torna a sua conta mais segura, exigindo que verifique o seu início de sessão com outro dispositivo, como uma chave de segurança, aplicação de autenticação, SMS, chamada telefónica ou e-mail. A verificação de dois passos pode ser configurada em bitwarden.com. Pretende visitar o site agora?</value>
+    <value>O início de sessão de dois passos torna a sua conta mais segura ao requerer que verifique o seu início de sessão com outro dispositivo como uma chave de segurança, aplicação de autenticação, SMS, chamada telefónica, ou email. O início de sessão de dois passos pode ser ativado no cofre web bitwarden.com. Pretende visitar o website agora?</value>
  </data>
  <data name="UnlockWith" xml:space="preserve">
    <value>Desbloquear com {0}</value>
@@ -754,10 +754,10 @@
    <comment>This is used for the autofill service. ex. "There are no items in your vault for twitter.com".</comment>
  </data>
  <data name="BitwardenAutofillServiceOverlay" xml:space="preserve">
-    <value>Quando seleciona um campo de entrada e vê uma sobreposição de preenchimento automático do Bitwarden, pode tocar nela para iniciar o serviço de preenchimento automático.</value>
+    <value>Quando seleciona um campo de entrada e vê uma sobreposição de auto-preenchimento do Bitwarden, irá poder tocar neste para iniciar o serviço de auto-preenchimento.</value>
  </data>
  <data name="BitwardenAutofillServiceNotificationContent" xml:space="preserve">
-    <value>Toque nesta notificação para preencher automaticamente um item do seu cofre.</value>
+    <value>Toque nesta notificação para auto-preencher um item do seu cofre.</value>
  </data>
  <data name="BitwardenAutofillServiceOpenAccessibilitySettings" xml:space="preserve">
    <value>Abrir definições de acessibilidade</value>
@@ -775,25 +775,25 @@
    <value>Ativado</value>
  </data>
  <data name="Off" xml:space="preserve">
-    <value>Desligado</value>
+    <value>Off</value>
  </data>
  <data name="On" xml:space="preserve">
-    <value>Ligado</value>
+    <value>On</value>
  </data>
  <data name="Status" xml:space="preserve">
    <value>Estado</value>
  </data>
  <data name="BitwardenAutofillServiceAlert2" xml:space="preserve">
-    <value>A maneira mais fácil de adicionar novos inícios de sessão ao seu cofre é a partir do Serviço de preenchimento automático do Bitwarden. Saiba mais sobre como utilizar o Serviço de preenchimento automático do Bitwarden ao navegar até ao ecrã "Definições".</value>
+    <value>A maneira mais fácil de adicionar novas credenciais ao seu cofre é a partir do serviço de auto-preenchimento Bitwarden. Saiba mais acerca do serviço de auto-preenchimento Bitwarden ao navegar para o ecrã de "Ferramentas".</value>
  </data>
  <data name="Autofill" xml:space="preserve">
-    <value>Preencher automaticamente</value>
+    <value>Auto-preencher</value>
  </data>
  <data name="AutofillOrView" xml:space="preserve">
-    <value>Pretende preencher automaticamente ou visualizar este item?</value>
+    <value>Pretende auto-preencher ou ver este item?</value>
  </data>
  <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
-    <value>Tem a certeza de que pretende preencher automaticamente este item? Não é uma correspondência completa para "{0}".</value>
+    <value>Tem a certeza de que pretende auto-preencher este item? Não é uma correspondência completa para "{0}".</value>
  </data>
  <data name="MatchingItems" xml:space="preserve">
    <value>Itens correspondentes</value>
@@ -805,17 +805,17 @@
    <value>Pesquisar</value>
  </data>
  <data name="BitwardenAutofillServiceSearch" xml:space="preserve">
-    <value>Está à procura de um item de preenchimento automático para "{0}".</value>
+    <value>Está a pesquisar por um item de auto-preenchimento para "{0}".</value>
  </data>
  <data name="LearnOrg" xml:space="preserve">
-    <value>Saiba mais sobre as organizações</value>
+    <value>Saiba Mais sobre as Organizações</value>
  </data>
  <data name="CannotOpenApp" xml:space="preserve">
    <value>Não é possível abrir a aplicação "{0}".</value>
    <comment>Message shown when trying to launch an app that does not exist on the user's device.</comment>
  </data>
  <data name="AuthenticatorAppTitle" xml:space="preserve">
-    <value>Aplicação de autenticação</value>
+    <value>Aplicação de autenticador</value>
    <comment>For 2FA</comment>
  </data>
  <data name="EnterVerificationCodeApp" xml:space="preserve">
@@ -831,7 +831,7 @@
    <comment>For 2FA whenever there are no available providers on this device.</comment>
  </data>
  <data name="NoTwoStepAvailable" xml:space="preserve">
-    <value>Esta conta tem a verificação de dois passos configurada, no entanto, nenhum dos fornecedores de dois passos configurados é suportado neste dispositivo. Utilize um dispositivo suportado e/ou adicione fornecedores adicionais que sejam mais bem suportados nos dispositivos (como uma aplicação de autenticação).</value>
+    <value>Esta conta tem início de sessão de dois passos ativado, no entanto, nenhum dos fornecedores de dois passos configurados são suportados neste dispositivo. Por favor utilize um dispositivo suportado e/ou adiciono fornecedores adicionais que são melhor suportados entre dispositivos (como uma aplicação de autenticador).</value>
  </data>
  <data name="RecoveryCodeTitle" xml:space="preserve">
    <value>Código de recuperação</value>
@@ -846,17 +846,17 @@
    <comment>For 2FA</comment>
  </data>
  <data name="TwoStepLoginOptions" xml:space="preserve">
-    <value>Opções de verificação de dois passos</value>
+    <value>Opções de início de sessão de dois passos</value>
  </data>
  <data name="UseAnotherTwoStepMethod" xml:space="preserve">
-    <value>Utilizar outro método de verificação de dois passos</value>
+    <value>Utilizar outro método de início de sessão de dois passos</value>
  </data>
  <data name="VerificationEmailNotSent" xml:space="preserve">
    <value>Não foi possível enviar o email de verificação. Tente novamente.</value>
    <comment>For 2FA</comment>
  </data>
  <data name="VerificationEmailSent" xml:space="preserve">
-    <value>E-mail de verificação enviado</value>
+    <value>Email de verificação enviado.</value>
    <comment>For 2FA</comment>
  </data>
  <data name="YubiKeyInstruction" xml:space="preserve">
@@ -887,7 +887,7 @@
    <comment>The placeholder will show the file size of the attachment. Ex "25 MB"</comment>
  </data>
  <data name="AuthenticatorKey" xml:space="preserve">
-    <value>Chave de autenticação (TOTP)</value>
+    <value>Chave de autenticador (TOTP)</value>
  </data>
  <data name="VerificationCodeTotp" xml:space="preserve">
    <value>Código de verificação (TOTP)</value>
@@ -916,7 +916,7 @@ Scanning will happen automatically.</value>
    <value>Copiar TOTP</value>
  </data>
  <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
-    <value>Se um início de sessão tiver uma chave de autenticação, copie o código de verificação TOTP para a sua área de transferência quando preencher automaticamente o início de sessão.</value>
+    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
  </data>
  <data name="CopyTotpAutomatically" xml:space="preserve">
    <value>Copy TOTP automatically</value>
@@ -1080,7 +1080,7 @@ Scanning will happen automatically.</value>
    <value>Último nome</value>
  </data>
  <data name="FullName" xml:space="preserve">
-    <value>Nome completo</value>
+    <value>Nome Completo</value>
  </data>
  <data name="LicenseNumber" xml:space="preserve">
    <value>Número da licença</value>
@@ -1149,7 +1149,7 @@ Scanning will happen automatically.</value>
    <value>URL do servidor de ícones</value>
  </data>
  <data name="AutofillWithBitwarden" xml:space="preserve">
-    <value>Preencher automaticamente com o Bitwarden</value>
+    <value>Auto-preencher com o Bitwarden</value>
  </data>
  <data name="VaultIsLocked" xml:space="preserve">
    <value>O cofre está bloqueado</value>
@@ -1170,13 +1170,13 @@ Scanning will happen automatically.</value>
    <value>Não existem itens no lixo.</value>
  </data>
  <data name="AutofillAccessibilityService" xml:space="preserve">
-    <value>Serviço de acessibilidade de preenchimento automático</value>
+    <value>Serviço de acessibilidade de auto-preenchimento</value>
  </data>
  <data name="AutofillServiceDescription" xml:space="preserve">
-    <value>O serviço de preenchimento automático do Bitwarden utiliza o Android Autofill Framework para ajudar a preencher as informações de início de sessão noutras aplicações no seu dispositivo.</value>
+    <value>O serviço de auto-preenchimento do Bitwarden utiliza a Android Autofill Framework para assistir a preencher credenciais, cartões de crédito, e informação de identidade noutras aplicações do seu dispositivo.</value>
  </data>
  <data name="BitwardenAutofillServiceDescription" xml:space="preserve">
-    <value>Utilize o serviço de preenchimento automático do Bitwarden para preencher informações de início de sessão noutras aplicações.</value>
+    <value>Utilize o serviço de auto-preenchimento do Bitwarden para preencher credenciais, cartões de crédito, e informação de identidade noutras aplicações.</value>
  </data>
  <data name="BitwardenAutofillServiceOpenAutofillSettings" xml:space="preserve">
    <value>Abrir definições de auto-preenchimento</value>
@@ -1262,7 +1262,7 @@ Scanning will happen automatically.</value>
    <value>Sim, e guardar</value>
  </data>
  <data name="AutofillAndSave" xml:space="preserve">
-    <value>Preencher automaticamente e guardar</value>
+    <value>Auto-preencher e guardar</value>
  </data>
  <data name="Organization" xml:space="preserve">
    <value>Organização</value>
@@ -1278,7 +1278,7 @@ Scanning will happen automatically.</value>
    <value>Para continuar, segure a sua YubiKey NEO contra a parte de trás do dispositivo.</value>
  </data>
  <data name="BitwardenAutofillAccessibilityServiceDescription2" xml:space="preserve">
-    <value>Pode ser útil utilizar o serviço de acessibilidade quando as aplicações não suportam o serviço de preenchimento automático padrão.</value>
+    <value>O serviço de acessibilidade pode ser útil para utilizar quando as aplicações não suportam o serviço de auto-preenchimento padrão.</value>
  </data>
  <data name="DatePasswordUpdated" xml:space="preserve">
    <value>Palavra-passe atualizada</value>
@@ -1304,7 +1304,7 @@ Scanning will happen automatically.</value>
    <value>Aceda ao seu cofre diretamente a partir do seu teclado para rapidamente auto-preencher palavras-passe.</value>
  </data>
  <data name="AutofillTurnOn" xml:space="preserve">
-    <value>Para configurar o preenchimento automático de palavras-passe no seu dispositivo, siga estas instruções:</value>
+    <value>Para ativar o auto-preenchimento de palavras-passe no seu dispositivo, siga estas instruções:</value>
  </data>
  <data name="AutofillTurnOn1" xml:space="preserve">
    <value>1. Vá à aplicação iOS "Definições"</value>
@@ -1322,7 +1322,7 @@ Scanning will happen automatically.</value>
    <value>5. Selecione "Bitwarden"</value>
  </data>
  <data name="PasswordAutofill" xml:space="preserve">
-    <value>Preenchimento automático de palavras-passe</value>
+    <value>Auto-preenchimento de palavras-passe</value>
  </data>
  <data name="BitwardenAutofillAlert2" xml:space="preserve">
    <value>A maneira mais fácil de adicionar novas credenciais ao seu cofre é ao utilizar a extensão de auto-preenchimento de palavras-passe do Bitwarden. Saiba mais acerca de como utilizar a extensão de auto-preenchimento de palavras-passe do Bitwarden ao navegar para o ecrã de "Definições".</value>
@@ -1390,7 +1390,7 @@ Scanning will happen automatically.</value>
    <value>Search text Sends</value>
  </data>
  <data name="SearchGroup" xml:space="preserve">
-    <value>Procurar {0}</value>
+    <value>Pesquisar {0}</value>
    <comment>ex: Search Logins</comment>
  </data>
  <data name="Type" xml:space="preserve">
@@ -1483,7 +1483,7 @@ Scanning will happen automatically.</value>
    <value>Desbloquear</value>
  </data>
  <data name="UnlockVault" xml:space="preserve">
-    <value>Desbloquear cofre</value>
+    <value>Unlock vault</value>
  </data>
  <data name="ThirtyMinutes" xml:space="preserve">
    <value>30 minutos</value>
@@ -1540,7 +1540,7 @@ Scanning will happen automatically.</value>
    <comment>Default URI match detection for auto-fill.</comment>
  </data>
  <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
-    <value>Escolha a forma predefinida como a deteção de correspondência de URI é tratada para inícios de sessão ao executar ações como o preenchimento automático.</value>
+    <value>Escolha a maneira predefinida pela qual a deteção de correspondência de URI é manuseada para credenciais ao realizar ações como auto-preenchimento.</value>
  </data>
  <data name="Theme" xml:space="preserve">
    <value>Tema</value>
@@ -1550,10 +1550,10 @@ Scanning will happen automatically.</value>
    <value>Altere o tema de cor da aplicação.</value>
  </data>
  <data name="ThemeDefault" xml:space="preserve">
-    <value>Predefinido (Sistema)</value>
+    <value>Default (System)</value>
  </data>
  <data name="DefaultDarkTheme" xml:space="preserve">
-    <value>Tema escuro predefinido</value>
+    <value>Tema Escuro Predefinido</value>
  </data>
  <data name="DefaultDarkThemeDescription" xml:space="preserve">
    <value>Choose the dark theme to use when using Default (System) theme while your device's dark mode is in use.</value>
@@ -1583,10 +1583,10 @@ Scanning will happen automatically.</value>
    <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
  </data>
  <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>Preencher automaticamente URIs bloqueados</value>
+    <value>Auto-fill blocked URIs</value>
  </data>
  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>O preenchimento automático não será oferecido para URIs bloqueados. Separe vários URIs com uma vírgula. Por exemplo: "https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>Ask to add login</value>
@@ -1598,7 +1598,7 @@ Scanning will happen automatically.</value>
    <value>Quando reiniciar a aplicação</value>
  </data>
  <data name="AutofillServiceNotEnabled" xml:space="preserve">
-    <value>O preenchimento automático facilita o acesso seguro ao seu cofre do Bitwarden a partir de outros sites e aplicações. Parece que o utilizador não configurou um serviço de preenchimento automático do Bitwarden. Configure o preenchimento automático do Bitwarden a partir do ecrã "Definições".</value>
+    <value>O auto-preenchimento torna fácil aceder em segurança ao seu cofre Bitwarden a partir de outros websites e aplicações. Parece que não ativou um serviço de auto-preenchimento para o Bitwarden. Ative o auto-preenchimento para o Bitwarden a partir do ecrã "Definições".</value>
  </data>
  <data name="ThemeAppliedOnRestart" xml:space="preserve">
    <value>As suas alterações de tema irão ser aplicadas quando a aplicação for reiniciada.</value>
@@ -1632,7 +1632,7 @@ Scanning will happen automatically.</value>
    <value>Utilizar biometria para desbloquear</value>
  </data>
  <data name="AccessibilityOverlayPermissionAlert" xml:space="preserve">
-    <value>O Bitwarden precisa de atenção - Veja o "Serviço de acessibilidade de preenchimento automático" nas definições do Bitwarden</value>
+    <value>O Bitwarden precisa da sua atenção - Veja o "Serviço de acessibilidade de auto-preenchimento" nas Definições do Bitwarden</value>
  </data>
  <data name="BitwardenAutofillServiceOverlayPermission" xml:space="preserve">
    <value>3. No ecrã Definições da App para o Bitwarden no Android, vá às opções "Sobrepor a outras aplicações" (em Avançadas) e toque na opção para ativar o suporte de sobreposição.</value>
@@ -1659,10 +1659,10 @@ Scanning will happen automatically.</value>
    <value>Introduza a sua palavra-passe mestra para exportar os dados do seu cofre.</value>
  </data>
  <data name="SendVerificationCodeToEmail" xml:space="preserve">
-    <value>Enviar um código de verificação para o seu e-mail</value>
+    <value>Send a verification code to your email</value>
  </data>
  <data name="CodeSent" xml:space="preserve">
-    <value>Código enviado!</value>
+    <value>Code sent!</value>
  </data>
  <data name="ConfirmYourIdentity" xml:space="preserve">
    <value>Confirm your identity to continue.</value>
@@ -1707,7 +1707,7 @@ Scanning will happen automatically.</value>
    <value>Anexo guardado com sucesso</value>
  </data>
  <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Por favor, ative o "Serviço de acessibilidade de preenchimento automático" nas definições do Bitwarden para utilizar o mosaico de preenchimento automático.</value>
+    <value>Por favor ative o "Serviço de acessibilidade de auto-preenchimento" nas Definições do Bitwarden para utilizar o bloco de Auto-preenchimento.</value>
  </data>
  <data name="AutofillTileUriNotFound" xml:space="preserve">
    <value>Nenhum campo de palavra-passe detetado</value>
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Pretende mesmo enviar para o lixo?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Alteração biométrica detetada, inicie sessão utilizando a palavra-passe mestra para ativar novamente.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Desbloqueio biométrico para preenchimento automático desabilitado. Aguarda verificação da palavra-passe mestre.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Ativar sincronização ao atualizar</value>
@@ -1768,10 +1768,10 @@ Scanning will happen automatically.</value>
    <value>Início de Sessão Único da Empresa</value>
  </data>
  <data name="LogInSsoSummary" xml:space="preserve">
-    <value>Inicie sessão rapidamente utilizando o portal de início de sessão único da sua organização. Por favor, introduza o identificador da sua organização para começar.</value>
+    <value>Inicie sessão rapidamente utilizando o portal de início de sessão único da sua organização. Por favor introduza o identificador da sua organização para começar.</value>
  </data>
  <data name="OrgIdentifier" xml:space="preserve">
-    <value>Identificador da organização</value>
+    <value>Identificador da Organização</value>
  </data>
  <data name="LoginSsoError" xml:space="preserve">
    <value>Não foi possível iniciar sessão com SSO</value>
@@ -1780,10 +1780,10 @@ Scanning will happen automatically.</value>
    <value>Definir palavra-passe mestra</value>
  </data>
  <data name="SetMasterPasswordSummary" xml:space="preserve">
-    <value>Para concluir o início de sessão com SSO, por favor, defina uma palavra-passe mestra para aceder e proteger o seu cofre.</value>
+    <value>Para concluir o início de sessão com SSO, por favor defina uma palavra-passe mestra para aceder e proteger o seu cofre.</value>
  </data>
  <data name="MasterPasswordPolicyInEffect" xml:space="preserve">
-    <value>Uma ou mais políticas da organização requerem que a sua palavra-passe mestra cumpra os seguintes requisitos:</value>
+    <value>Uma ou mais políticas da organização requerem que a sua palavra-passe mestra cumpra aos seguintes requisitos:</value>
  </data>
  <data name="PolicyInEffectMinComplexity" xml:space="preserve">
    <value>Pontuação mínima de complexidade de {0}</value>
@@ -1804,7 +1804,7 @@ Scanning will happen automatically.</value>
    <value>Contém um ou mais dos seguintes caracteres especiais: {0}</value>
  </data>
  <data name="MasterPasswordPolicyValidationTitle" xml:space="preserve">
-    <value>Palavra-passe inválida</value>
+    <value>Palavra-passe Inválida</value>
  </data>
  <data name="MasterPasswordPolicyValidationMessage" xml:space="preserve">
    <value>Palavra-passe mestra não cumpre os requisitos da organização. Por favor verifique a informação da política e tente novamente.</value>
@@ -1828,7 +1828,7 @@ Scanning will happen automatically.</value>
    <value>Bitwarden needs attention - Turn on "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
  </data>
  <data name="AutofillServices" xml:space="preserve">
-    <value>Serviços de preenchimento automático</value>
+    <value>Serviços de Autopreenchimento</value>
  </data>
  <data name="InlineAutofill" xml:space="preserve">
    <value>Usar preenchimento automático</value>
@@ -1840,7 +1840,7 @@ Scanning will happen automatically.</value>
    <value>Usar Acessibilidade</value>
  </data>
  <data name="AccessibilityDescription" xml:space="preserve">
-    <value>Utilize o Serviço de acessibilidade do Bitwarden para preencher automaticamente os seus inícios de sessão em aplicações e na web. Quando configurado, exibiremos um pop-up quando os campos de início de sessão forem selecionados.</value>
+    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. When set up, we'll display a popup when login fields are selected.</value>
  </data>
  <data name="AccessibilityDescription2" xml:space="preserve">
    <value>Use the Bitwarden Accessibility Service to auto-fill your logins across apps and the web. (Requires Draw-Over to be turned on as well)</value>
@@ -1858,7 +1858,7 @@ Scanning will happen automatically.</value>
    <value>Allows the Bitwarden Accessibility Service to display a popup when login fields are selected.</value>
  </data>
  <data name="DrawOverDescription2" xml:space="preserve">
-    <value>Se estiver ativado, o Serviço de acessibilidade do Bitwarden apresentará um pop-up quando os campos de início de sessão forem selecionados para ajudar no preenchimento automático dos seus inícios de sessão.</value>
+    <value>If turned on, the Bitwarden Accessibility Service will display a popup when login fields are selected to assist with auto-filling your logins.</value>
  </data>
  <data name="DrawOverDescription3" xml:space="preserve">
    <value>If turned on, accessibility will show a popup to augment the Autofill Service for older apps that don't support the Android Autofill Framework.</value>
@@ -2029,22 +2029,22 @@ Scanning will happen automatically.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="OneDay" xml:space="preserve">
-    <value>1 dia</value>
+    <value>1 day</value>
  </data>
  <data name="TwoDays" xml:space="preserve">
-    <value>2 dias</value>
+    <value>2 days</value>
  </data>
  <data name="ThreeDays" xml:space="preserve">
-    <value>3 dias</value>
+    <value>3 days</value>
  </data>
  <data name="SevenDays" xml:space="preserve">
-    <value>7 dias</value>
+    <value>7 days</value>
  </data>
  <data name="ThirtyDays" xml:space="preserve">
-    <value>30 dias</value>
+    <value>30 days</value>
  </data>
  <data name="Custom" xml:space="preserve">
-    <value>Personalizado</value>
+    <value>Custom</value>
  </data>
  <data name="ShareOnSave" xml:space="preserve">
    <value>Share this Send upon save</value>
@@ -2089,7 +2089,7 @@ Scanning will happen automatically.</value>
    <value>Captcha failed. Please try again.</value>
  </data>
  <data name="UpdatedMasterPassword" xml:space="preserve">
-    <value>Palavra-passe mestra atualizada</value>
+    <value>Palavra-passe Mestra Atualizada</value>
  </data>
  <data name="UpdateMasterPassword" xml:space="preserve">
    <value>Update master password</value>
@@ -2140,13 +2140,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2155,7 +2149,7 @@ Scanning will happen automatically.</value>
    <value>One or more organization policies prevents your from exporting your individual vault.</value>
  </data>
  <data name="AddAccount" xml:space="preserve">
-    <value>Adicionar conta</value>
+    <value>Adicionar Conta</value>
  </data>
  <data name="AccountUnlocked" xml:space="preserve">
    <value>Desbloqueado</value>
@@ -2164,13 +2158,13 @@ Scanning will happen automatically.</value>
    <value>Bloqueado</value>
  </data>
  <data name="AccountLoggedOut" xml:space="preserve">
-    <value>Sessão terminada</value>
+    <value>Sessão Terminada</value>
  </data>
  <data name="AccountSwitchedAutomatically" xml:space="preserve">
-    <value>Alterada para a conta seguinte disponível</value>
+    <value>Alterada para a próxima conta disponível</value>
  </data>
  <data name="AccountLockedSuccessfully" xml:space="preserve">
-    <value>Conta bloqueada</value>
+    <value>Conta Bloqueada</value>
  </data>
  <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
    <value>Sessão terminada com sucesso</value>
@@ -2215,10 +2209,10 @@ Scanning will happen automatically.</value>
    <value>A verificar</value>
  </data>
  <data name="ResendCode" xml:space="preserve">
-    <value>Reenviar código</value>
+    <value>Reenviar Código</value>
  </data>
  <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
-    <value>Foi enviado um código de verificação para o seu e-mail</value>
+    <value>Um código de verificação foi enviado para o seu e-mail</value>
  </data>
  <data name="AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPleaseTryAgain" xml:space="preserve">
    <value>Ocorreu um erro ao enviar um código de verificação para o seu e-mail. Por favor, tente novamente</value>
@@ -2239,13 +2233,13 @@ Scanning will happen automatically.</value>
    <value>Options are collapsed, tap to expand.</value>
  </data>
  <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>Maiúsculas (A-Z)</value>
+    <value>Uppercase (A to Z)</value>
  </data>
  <data name="LowercaseAtoZ" xml:space="preserve">
-    <value>Minúsculas (a-z)</value>
+    <value>Lowercase (A to Z)</value>
  </data>
  <data name="NumbersZeroToNine" xml:space="preserve">
-    <value>Números (0-9)</value>
+    <value>Numbers (0 to 9)</value>
  </data>
  <data name="SpecialCharacters" xml:space="preserve">
    <value>Special characters (!@#$%^&amp;*)</value>
@@ -2263,7 +2257,7 @@ Scanning will happen automatically.</value>
    <value>Filtrar itens por cofre</value>
  </data>
  <data name="AllVaults" xml:space="preserve">
-    <value>Todos os cofres</value>
+    <value>Todos os Cofres</value>
  </data>
  <data name="Vaults" xml:space="preserve">
    <value>Cofres</value>
@@ -2366,19 +2360,19 @@ select Add TOTP to store the key safely</value>
    <value>Aprovar pedidos de início de sessão</value>
  </data>
  <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Utilize este dispositivo para aprovar pedidos de início de sessão efetuados a partir de outros dispositivos.</value>
+    <value>Utilize este dispositivo para aprovar pedidos de inícios de sessão feitos a partir de outros dispositivos.</value>
  </data>
  <data name="AllowNotifications" xml:space="preserve">
    <value>Permitir notificações</value>
  </data>
  <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>Receber notificações push de novos pedidos de início de sessão</value>
+    <value>Receber notificações para novos pedidos de início de sessão</value>
  </data>
  <data name="NoThanks" xml:space="preserve">
    <value>Não, obrigado</value>
  </data>
  <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>Confirmar tentativa de início de sessão de {0}</value>
+    <value>Confirmar tentativa de início de sessão para {0}</value>
  </data>
  <data name="AllNotifications" xml:space="preserve">
    <value>Todas as notificações</value>
@@ -2387,10 +2381,10 @@ select Add TOTP to store the key safely</value>
    <value>Password type</value>
  </data>
  <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>O que é que gostaria de gerar?</value>
+    <value>What would you like to generate?</value>
  </data>
  <data name="UsernameType" xml:space="preserve">
-    <value>Tipo de nome de utilizador</value>
+    <value>Username type</value>
  </data>
  <data name="PlusAddressedEmail" xml:space="preserve">
    <value>Plus addressed email</value>
@@ -2440,10 +2434,10 @@ select Add TOTP to store the key safely</value>
    <value>API access token</value>
  </data>
  <data name="AreYouSureYouWantToOverwriteTheCurrentUsername" xml:space="preserve">
-    <value>Tem a certeza de que deseja sobrescrever o nome de utilizador atual?</value>
+    <value>Are you sure you want to overwrite the current username?</value>
  </data>
  <data name="GenerateUsername" xml:space="preserve">
-    <value>Gerar nome de utilizador</value>
+    <value>Generate username</value>
  </data>
  <data name="EmailType" xml:space="preserve">
    <value>Email Type</value>
@@ -2490,13 +2484,13 @@ select Add TOTP to store the key safely</value>
 Deseja mudar para esta conta?</value>
  </data>
  <data name="NewAroundHere" xml:space="preserve">
-    <value>É novo por cá?</value>
+    <value>Novo por aqui?</value>
  </data>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obter dica da palavra-passe mestra</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>A iniciar sessão como {0} em {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>A iniciar sessão como {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Utilizador incorreto?</value>
@@ -2544,13 +2538,13 @@ Deseja mudar para esta conta?</value>
    <value>No pending requests</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Ative a permissão da câmara para utilizar o digitalizador</value>
+    <value>Ative a permissão da câmara para usar o digitalizador</value>
  </data>
  <data name="Language" xml:space="preserve">
    <value>Idioma</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>O idioma foi alterado para {0}. Por favor, reinicie a aplicação para ver as alterações</value>
+    <value>O idioma foi alterado para {0}. Por favor, reinicie a aplicação para ver a alteração</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
    <value>A alteração do idioma requer o reinício da aplicação</value>
@@ -2609,25 +2603,4 @@ Deseja mudar para esta conta?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>EUA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>UE</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Auto-hospedado</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Região dos dados</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Região</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ro.resx
+++ b/src/App/Resources/AppResources.ro.resx
@@ -397,10 +397,10 @@
    <value>Vizitați-ne website-ul</value>
  </data>
  <data name="VisitOurWebsiteDescription" xml:space="preserve">
-    <value>Vizitați siteul nostru pentru a primi ajutor, știri, pentru a trimite e-mail, și/sau aflați mai multe despre cum să utilizați Bitwarden.</value>
+    <value>Vizitați saitul nostru pentru a primi ajutor, știri, pentru a trimite e-mail, și/sau aflați mai multe despre cum să utilizați Bitwarden.</value>
  </data>
  <data name="Website" xml:space="preserve">
-    <value>Site web</value>
+    <value>Sait web</value>
    <comment>Label for a website.</comment>
  </data>
  <data name="Yes" xml:space="preserve">
@@ -523,7 +523,7 @@
    <value>Import de articole</value>
  </data>
  <data name="ImportItemsConfirmation" xml:space="preserve">
-    <value>Puteți să importați datele de conectare din seiful web bitwarden.com. Doriți să vizitați siteul acum?</value>
+    <value>Puteți să importați datele de conectare din seiful web bitwarden.com. Doriți să vizitați saitul acum?</value>
  </data>
  <data name="ImportItemsDescription" xml:space="preserve">
    <value>Import rapid al datelor de conectare din alte aplicații de gestionare a parolelor.</value>
@@ -613,7 +613,7 @@
    <value>Nu există niciun articol în seiful dvs.</value>
  </data>
  <data name="NoItemsTap" xml:space="preserve">
-    <value>Nu sunt articole în seif pentru acest site/aplicație. Atingeți pentru a adăuga unul.</value>
+    <value>Nu sunt articole în seif pentru acest sait/aplicație. Atingeți pentru a adăuga unul.</value>
  </data>
  <data name="NoUsernamePasswordConfigured" xml:space="preserve">
    <value>Această autentificare nu are un nume de utilizator sau parolă configurate.</value>
@@ -1295,7 +1295,7 @@ Scanarea se va face automat.</value>
    <value>Trebuie să vă conectați la aplicația principală Bitwarden înainte de a putea utiliza auto-completarea.</value>
  </data>
  <data name="AutofillSetup" xml:space="preserve">
-    <value>Conectările dvs. sunt acum ușor accesibile chiar de la tastatură în timp ce vă conectați la aplicații și site-uri web.</value>
+    <value>Conectările dvs. sunt acum ușor accesibile chiar de la tastatură în timp ce vă conectați la aplicații și saituri web.</value>
  </data>
  <data name="AutofillSetup2" xml:space="preserve">
    <value>Vă recomandăm să dezactivați orice alte aplicații cu auto-completare din Setări dacă nu intenționați să le utilizați.</value>
@@ -1468,7 +1468,7 @@ Scanarea se va face automat.</value>
    <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
  </data>
  <data name="LearnOrgConfirmation" xml:space="preserve">
-    <value>Bitwarden vă permite să vă partajați seiful cu alte persoane utilizând un cont pentru organizații. Doriți să vizitați siteul bitwarden.com pentru a afla mai multe?</value>
+    <value>Bitwarden vă permite să vă partajați seiful cu alte persoane utilizând un cont pentru organizații. Doriți să vizitați saitul bitwarden.com pentru a afla mai multe?</value>
  </data>
  <data name="ExportVault" xml:space="preserve">
    <value>Export seif</value>
@@ -1752,11 +1752,11 @@ Scanarea se va face automat.</value>
    <value>Sigur doriți să trimiteți în coșul de reciclare?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Deblocarea biometrică pentru acest cont este dezactivată în așteptarea verificării parolei principale.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Deblocarea biometrică a fost dezactivată în așteptarea verificării parolei principale.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Completarea automată a deblocării biometrice pentru acest cont este dezactivată în așteptarea verificării parolei principale.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Deblocarea biometrică pentru auto-completare a fost dezactivată în așteptarea verificării parolei principale.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Activare sincronizare la reîmprospătare</value>
@@ -2142,12 +2142,6 @@ Scanarea se va face automat.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Politicile de organizație afectează timpul de expirare a seifului. Timpul maxim de expirare a seifului este de {0} oră(e) și {1} minut(e)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Politicile organizației dumneavoastră afectează expirarea de seif. Timpul maxim permis de expirare a seifului este {0} ore şi {1} minut(e). Acţiunea de timeout a seifului este setată la {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Politicile organizației dvs. au setat acțiunea de expirare seif la {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Timpul de expirare al seifului depășește restricțiile stabilite de organizația dvs.</value>
  </data>
@@ -2495,8 +2489,8 @@ Doriți să comutați la acest cont?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Obțineți indiciul parolei principale</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Autentificare ca {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nu sunteți dvs.?</value>
@@ -2609,25 +2603,4 @@ Doriți să comutați la acest cont?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Nu există lucruri care să corespundă căutării</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Parola principală nu îndeplinește una sau mai multe politici ale organizației. Pentru a accesa seiful trebuie să actualizați acum parola principală. Continuarea te va deconecta din sesiunea curentă, necesitând să te autentifici din nou. Sesiunile active pe alte dispozitive pot continua să rămână active timp de maxim o oră.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Parola principală curentă</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ru.resx
+++ b/src/App/Resources/AppResources.ru.resx
@@ -1752,11 +1752,11 @@
    <value>Вы действительно хотите отправить в корзину?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Биометрическая разблокировка для этого аккаунта отключена в ожидании проверки мастер-пароля.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Биометрическая разблокировка отключена в ожидании проверки мастер-пароля.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Биометрическая разблокировка автозаполнения для этого аккаунта отключена в ожидании проверки мастер-пароля.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Биометрическая разблокировка для автозаполнения отключена в ожидании проверки мастер-пароля.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Включить синхронизацию жестом</value>
@@ -2140,13 +2140,7 @@
    <value>В этой организации действует корпоративная политика, которая автоматически зарегистрирует вас на сброс пароля. Регистрация позволит администраторам организации изменить ваш мастер-пароль.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>В соответствии с политиками вашей организации максимально допустимый тайм-аут хранилища составляет {0} час. и {1} мин.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Политики вашей организации влияют на тайм-аут хранилища. Максимально допустимый тайм-аут хранилища составляет {0} час. и {1} мин. Для вашего хранилища задан тайм-аут {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Политики вашей организации установили тайм-аут хранилища на {0}.</value>
+    <value>Политики вашей организации влияют на тайм-аут хранилища. Максимально допустимый тайм-аут хранилища составляет {0} час. и {1} мин.</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Тайм-аут вашего хранилища превышает ограничения, установленные вашей организацией.</value>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Получить подсказку к мастер-паролю</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Войти как {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Войти как {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Не вы?</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Нет элементов, соответствующих запросу</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>США</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>Европа</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Собственный хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион данных</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ваш мастер-пароль не соответствует требованиям политики вашей организации. Для доступа к хранилищу вы должны обновить свой мастер-пароль прямо сейчас. При этом текущая сессия будет завершена и потребуется повторная авторизация. Сессии на других устройствах могут оставаться активными в течение часа.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Текущий мастер-пароль</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.si.resx
+++ b/src/App/Resources/AppResources.si.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.sk.resx
+++ b/src/App/Resources/AppResources.sk.resx
@@ -1752,11 +1752,11 @@ Skenovanie prebehne automaticky.</value>
    <value>Naozaj to chcete poslať do koša?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometrické odblokovanie pre tento účet je deaktivované až do overenia hlavného hesla.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Bola zaznamenaná zmena biometrických údajov, prihláste za svojím hlavným heslom aby ste opäť povolili prihlásenie.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Automatické vypĺňanie cez biometrické odblokovanie pre tento účet je deaktivované až do overenia hlavného hesla.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrické odblokovanie pre automatické dopĺňanie je deaktivované až do overenia hlavného hesla.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Povoliť synchronizáciu pri obnovení</value>
@@ -2142,12 +2142,6 @@ Skenovanie prebehne automaticky.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je {0} h a {1} m</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je {0} h a {1} m. Nastavenie akcie pri vypršaní časového limitu je {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Zásady vašej organizácie nastavili akciu pri vypršaní časového limitu trezora na {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Časový limit vášho trezora prekračuje obmedzenia nastavené vašou organizáciou.</value>
  </data>
@@ -2495,8 +2489,8 @@ Chcete prepnúť na toto konto?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Získať nápoveď pre hlavné heslo</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Prihlasujete sa ako {0} na {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Prihlasujete sa ako {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Nie ste to vy?</value>
@@ -2609,25 +2603,4 @@ Chcete prepnúť na toto konto?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Vyhľadávaniu nezodpovedajú žiadne položky</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>USA</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EÚ</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Vlastný hosting</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Dátová oblasť</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Región</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Vaše hlavné heslo nespĺňa jednu alebo viacero podmienok vašej organizácie. Ak chcete získať prístup k trezoru, musíte teraz aktualizovať svoje hlavné heslo. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Súčasné hlavné heslo</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.sl.resx
+++ b/src/App/Resources/AppResources.sl.resx
@@ -269,7 +269,7 @@
    <comment>Title for login page. (noun)</comment>
  </data>
  <data name="LogOut" xml:space="preserve">
-    <value>Odjavi se</value>
+    <value>Izpiši se</value>
    <comment>The log out button text (verb).</comment>
  </data>
  <data name="LogoutConfirmation" xml:space="preserve">
@@ -296,7 +296,7 @@
    <comment>Text to define that there are more options things to see.</comment>
  </data>
  <data name="MyVault" xml:space="preserve">
-    <value>Moj trezor</value>
+    <value>Moj sef</value>
    <comment>The title for the vault page.</comment>
  </data>
  <data name="Authenticator" xml:space="preserve">
@@ -342,7 +342,7 @@
    <comment>Reveal a hidden value (password).</comment>
  </data>
  <data name="ItemDeleted" xml:space="preserve">
-    <value>Element je bil izbrisan.</value>
+    <value>Vnos je bil izbrisan.</value>
    <comment>Confirmation message after successfully deleting a login.</comment>
  </data>
  <data name="Submit" xml:space="preserve">
@@ -413,7 +413,7 @@
    <value>Vas novi račun je bil ustvarjen! Lahko se vpišete. </value>
  </data>
  <data name="AddAnItem" xml:space="preserve">
-    <value>Dodaj Element</value>
+    <value>Dodaj vnos</value>
  </data>
  <data name="AppExtension" xml:space="preserve">
    <value>Razširitev aplikacije</value>
@@ -425,7 +425,7 @@
    <value>Storitev samodejnega izpolnjevanja</value>
  </data>
  <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>Brez dvoumnih znakov</value>
+    <value>Izogib dvoumnih znakov</value>
  </data>
  <data name="BitwardenAppExtension" xml:space="preserve">
    <value>Razširitev aplikacije Bitwarden</value>
@@ -468,7 +468,7 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="EditItem" xml:space="preserve">
-    <value>Uredi element</value>
+    <value>Uredi vnos</value>
  </data>
  <data name="EnableAutomaticSyncing" xml:space="preserve">
    <value>Omogoči samodejno sinhronizacijo</value>
@@ -514,13 +514,13 @@
    <value>Prstni odtis </value>
  </data>
  <data name="GeneratePassword" xml:space="preserve">
-    <value>Generiraj geslo</value>
+    <value>Ustvari geslo</value>
  </data>
  <data name="GetPasswordHint" xml:space="preserve">
    <value>Pridobi namig za glavno geslo</value>
  </data>
  <data name="ImportItems" xml:space="preserve">
-    <value>Uvozi elemente</value>
+    <value>Uvozi zapise</value>
  </data>
  <data name="ImportItemsConfirmation" xml:space="preserve">
    <value>You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?</value>
@@ -566,7 +566,7 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="LoginOrCreateNewAccount" xml:space="preserve">
-    <value>Prijavite se ali ustvarite nov račun za dostop do trezorja.</value>
+    <value>Vpišite se ali ustvarite nov račun za dostop do sefa.</value>
  </data>
  <data name="Manage" xml:space="preserve">
    <value>Upravljaj</value>
@@ -584,7 +584,7 @@
    <value>Namig glavnega gesla se vam lahko pomaga spomniti geslo, v kolikor bi ga pozabili.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>Glavno geslo mora vsebovati vsaj {0} znakov.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>Minimalno števil</value>
@@ -604,13 +604,13 @@
    <value>Nikoli</value>
  </data>
  <data name="NewItemCreated" xml:space="preserve">
-    <value>Nov element ustvarjen.</value>
+    <value>Nov vnos ustvarjen.</value>
  </data>
  <data name="NoFavorites" xml:space="preserve">
-    <value>V vašem trezorju ni priljubljenih elementov. </value>
+    <value>V vašem sefu ni priljubljenih vnosov. </value>
  </data>
  <data name="NoItems" xml:space="preserve">
-    <value>V vašem trezorju ni elementov. </value>
+    <value>V vašem sefu ni vnosov. </value>
  </data>
  <data name="NoItemsTap" xml:space="preserve">
    <value>There are no items in your vault for this website/app. Tap to add one.</value>
@@ -632,7 +632,7 @@
    <value>Drugo</value>
  </data>
  <data name="PasswordGenerated" xml:space="preserve">
-    <value>Geslo generirano.</value>
+    <value>Geslo ustvarjeno.</value>
  </data>
  <data name="PasswordGenerator" xml:space="preserve">
    <value>Ustvarjalnik gesel</value>
@@ -678,24 +678,24 @@
    <value>Vnesite 4 mestno PIN številko za odklep aplikacije.</value>
  </data>
  <data name="ItemInformation" xml:space="preserve">
-    <value>Informacije o elementu</value>
+    <value>Informacije o vnosu</value>
  </data>
  <data name="ItemUpdated" xml:space="preserve">
-    <value>Element shranjen.</value>
+    <value>Vnos je posodobljen.</value>
  </data>
  <data name="Submitting" xml:space="preserve">
    <value>Pošiljanje...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Syncing" xml:space="preserve">
-    <value>Sinhroniziram...</value>
+    <value>Sinhronizacija...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="SyncingComplete" xml:space="preserve">
    <value>Sinhronizacija končana.</value>
  </data>
  <data name="SyncingFailed" xml:space="preserve">
-    <value>Sinhronizacija spodletela.</value>
+    <value>Sinhronizacija neuspešna.</value>
  </data>
  <data name="SyncVaultNow" xml:space="preserve">
    <value>Sinhroniziraj trezor zdaj</value>
@@ -714,7 +714,7 @@
    <value>Odkleni z {0}</value>
  </data>
  <data name="UnlockWithPIN" xml:space="preserve">
-    <value>Odkleni s PIN kodo</value>
+    <value>Odklepanje s PIN kodo</value>
  </data>
  <data name="Validating" xml:space="preserve">
    <value>Preverjanje veljavnosti</value>
@@ -724,16 +724,16 @@
    <value>Verifikacijska koda</value>
  </data>
  <data name="ViewItem" xml:space="preserve">
-    <value>Prikaži element</value>
+    <value>Ogled vnosa</value>
  </data>
  <data name="WebVault" xml:space="preserve">
-    <value>Spletni trezor Bitwarden</value>
+    <value>Bitwarden spletni sef </value>
  </data>
  <data name="Lost2FAApp" xml:space="preserve">
    <value>Izgubili aplikacijo za avtentikacijo? </value>
  </data>
  <data name="Items" xml:space="preserve">
-    <value>Elementi</value>
+    <value>Vnosi</value>
    <comment>Screen title</comment>
  </data>
  <data name="ExtensionActivated" xml:space="preserve">
@@ -746,11 +746,11 @@
    <value>Prevodi </value>
  </data>
  <data name="ItemsForUri" xml:space="preserve">
-    <value>Elementi za {0}</value>
+    <value>Vnosov za {0}</value>
    <comment>This is used for the autofill service. ex. "Logins for twitter.com"</comment>
  </data>
  <data name="NoItemsForUri" xml:space="preserve">
-    <value>V vašem trezorju ni elementov za {0}.</value>
+    <value>V vašem sefu ni vnosov za {0}.</value>
    <comment>This is used for the autofill service. ex. "There are no items in your vault for twitter.com".</comment>
  </data>
  <data name="BitwardenAutofillServiceOverlay" xml:space="preserve">
@@ -790,16 +790,16 @@
    <value>Samodejno izpolnjevanje</value>
  </data>
  <data name="AutofillOrView" xml:space="preserve">
-    <value>Želite samodejno izpolniti ali prikazati ta element?</value>
+    <value>Želite samodejno izpolniti ali videti ta vnos?</value>
  </data>
  <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
    <value>Ali ste prepričani, da želite samodejno izpolniti ta element? Ujemanje ni popolno za "{0}".</value>
  </data>
  <data name="MatchingItems" xml:space="preserve">
-    <value>Ujemajoči elementi</value>
+    <value>Ujemajoči vnosi</value>
  </data>
  <data name="PossibleMatchingItems" xml:space="preserve">
-    <value>Možni ujemajoči elementi</value>
+    <value>Možni ujemajoči vnosi</value>
  </data>
  <data name="Search" xml:space="preserve">
    <value>Iskanje</value>
@@ -1017,7 +1017,7 @@ Scanning will happen automatically.</value>
    <value>Prijava</value>
  </data>
  <data name="TypeSecureNote" xml:space="preserve">
-    <value>Zavarovan zapisek</value>
+    <value>Varni zapisek</value>
  </data>
  <data name="Address1" xml:space="preserve">
    <value>Naslov 1</value>
@@ -1140,10 +1140,10 @@ Scanning will happen automatically.</value>
    <value>Datum poteka</value>
  </data>
  <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Prikaži ikone spletnih strani</value>
+    <value>Show website icons</value>
  </data>
  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
-    <value>Pri vsaki prijavi prikaži prepoznavno sliko.</value>
+    <value>Show a recognizable image next to each login.</value>
  </data>
  <data name="IconsUrl" xml:space="preserve">
    <value>Ikone URL strežnikov</value>
@@ -1161,10 +1161,10 @@ Scanning will happen automatically.</value>
    <value>Zbirke</value>
  </data>
  <data name="NoItemsCollection" xml:space="preserve">
-    <value>Ta zbirka še nima elementov.</value>
+    <value>Ta zbirka še nima zapisov.</value>
  </data>
  <data name="NoItemsFolder" xml:space="preserve">
-    <value>V tej mapi ni elementov.</value>
+    <value>V tej mapi ni zapisov.</value>
  </data>
  <data name="NoItemsTrash" xml:space="preserve">
    <value>Koš je prazen.</value>
@@ -1182,7 +1182,7 @@ Scanning will happen automatically.</value>
    <value>Nastavitve samodejnega izpolnjevanja</value>
  </data>
  <data name="FaceID" xml:space="preserve">
-    <value>obraznim ID</value>
+    <value>Obrazni ID</value>
    <comment>What Apple calls their facial recognition reader.</comment>
  </data>
  <data name="FaceIDDirection" xml:space="preserve">
@@ -1322,7 +1322,7 @@ Scanning will happen automatically.</value>
    <value>5. Select "Bitwarden"</value>
  </data>
  <data name="PasswordAutofill" xml:space="preserve">
-    <value>Samodejno izpolnjevanje gesel</value>
+    <value>Password auto-fill</value>
  </data>
  <data name="BitwardenAutofillAlert2" xml:space="preserve">
    <value>The easiest way to add new logins to your vault is by using the Bitwarden Password AutoFill extension. Learn more about using the Bitwarden Password AutoFill extension by navigating to the "Settings" screen.</value>
@@ -1340,13 +1340,13 @@ Scanning will happen automatically.</value>
    <value>Prijave</value>
  </data>
  <data name="SecureNotes" xml:space="preserve">
-    <value>Zavarovani zapiski</value>
+    <value>Varni zapiski</value>
  </data>
  <data name="AllItems" xml:space="preserve">
    <value>Vsi elementi</value>
  </data>
  <data name="URIs" xml:space="preserve">
-    <value>URI-ji</value>
+    <value>URIs</value>
    <comment>Plural form of a URI</comment>
  </data>
  <data name="CheckingPassword" xml:space="preserve">
@@ -1369,7 +1369,7 @@ Scanning will happen automatically.</value>
    <value>Vrednost</value>
  </data>
  <data name="PasswordHistory" xml:space="preserve">
-    <value>Zgodovina gesel</value>
+    <value>Zgodovina gesla</value>
  </data>
  <data name="Types" xml:space="preserve">
    <value>Vrste</value>
@@ -1378,7 +1378,7 @@ Scanning will happen automatically.</value>
    <value>Ni gesel za prikazat.</value>
  </data>
  <data name="NoItemsToList" xml:space="preserve">
-    <value>Ni elementov za prikaz.</value>
+    <value>Ni vnosov za prikazat.</value>
  </data>
  <data name="SearchCollection" xml:space="preserve">
    <value>Preišči zbirko</value>
@@ -1409,7 +1409,7 @@ Scanning will happen automatically.</value>
    <value>Lastništvo</value>
  </data>
  <data name="WhoOwnsThisItem" xml:space="preserve">
-    <value>Kdo je lastnik tega elementa?</value>
+    <value>Kdo je lastnik tega vnosa?</value>
  </data>
  <data name="NoCollectionsToList" xml:space="preserve">
    <value>Ni zbirk za prikazat.</value>
@@ -1419,7 +1419,7 @@ Scanning will happen automatically.</value>
    <comment>ex: Item moved to Organization.</comment>
  </data>
  <data name="ItemShared" xml:space="preserve">
-    <value>Element je bil dan v skupno rabo.</value>
+    <value>Vnos je bil deljen.</value>
  </data>
  <data name="SelectOneCollection" xml:space="preserve">
    <value>Izbrati moraš vsaj eno zbirko.</value>
@@ -1428,10 +1428,10 @@ Scanning will happen automatically.</value>
    <value>Deli</value>
  </data>
  <data name="ShareItem" xml:space="preserve">
-    <value>Delite element</value>
+    <value>Delite vnos</value>
  </data>
  <data name="MoveToOrganization" xml:space="preserve">
-    <value>Premakni v organizacijo</value>
+    <value>Move to Organization</value>
  </data>
  <data name="NoOrgsToList" xml:space="preserve">
    <value>Ni organizacij za prikazat.</value>
@@ -1562,7 +1562,7 @@ Scanning will happen automatically.</value>
    <value>Kopiraj opombo</value>
  </data>
  <data name="Exit" xml:space="preserve">
-    <value>Izhod</value>
+    <value>Zapri</value>
  </data>
  <data name="ExitConfirmation" xml:space="preserve">
    <value>Ali res želite zapustiti Bitwarden?</value>
@@ -1583,16 +1583,16 @@ Scanning will happen automatically.</value>
    <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
  </data>
  <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>URI-ji brez samodejnega izpolnjevanja</value>
+    <value>Auto-fill blocked URIs</value>
  </data>
  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>Za te URI-je Bitwarden ne bo ponujal samodejnega izpolnjevanja. URI-je ločite z vejicami, n.pr.: "https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
  </data>
  <data name="AskToAddLogin" xml:space="preserve">
-    <value>Ponudi shranjevanje prijav</value>
+    <value>Ask to add login</value>
  </data>
  <data name="AskToAddLoginDescription" xml:space="preserve">
-    <value>Ponudi, da se shrani nova prijava, če je v trezorju še ni.</value>
+    <value>Ask to add an item if one isn't found in your vault.</value>
  </data>
  <data name="OnRestart" xml:space="preserve">
    <value>Ob ponovnem zagonu aplikacije</value>
@@ -1626,7 +1626,7 @@ Scanning will happen automatically.</value>
    <value>Biometrična avtentikacija</value>
  </data>
  <data name="Biometrics" xml:space="preserve">
-    <value>biometričnim preverjanjem</value>
+    <value>Biometrično preverjanje</value>
  </data>
  <data name="UseBiometricsToUnlock" xml:space="preserve">
    <value>Uporabi biometrično preverjanje za odklep</value>
@@ -1729,7 +1729,7 @@ Scanning will happen automatically.</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="ItemRestored" xml:space="preserve">
-    <value>Element je bil obnovljen.</value>
+    <value>Vnos je bil obnovljen.</value>
    <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
  </data>
  <data name="Trash" xml:space="preserve">
@@ -1745,24 +1745,24 @@ Scanning will happen automatically.</value>
    <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
  </data>
  <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Ali res želite povrniti ta element?</value>
+    <value>Ali res želite povrniti ta vnos?</value>
    <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
  </data>
  <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
    <value>Ali res želite poslati v koš?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
-    <value>Dovoli sihnronizacijo ob osvežitvi</value>
+    <value>Allow sync on refresh</value>
  </data>
  <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
-    <value>Sinhroniziraj ob potegu navzdol</value>
+    <value>Syncing vault with pull down gesture.</value>
  </data>
  <data name="LogInSso" xml:space="preserve">
    <value>Enterprise single sign-on</value>
@@ -1829,7 +1829,7 @@ Scanning will happen automatically.</value>
    <value>Bitwarden needs attention - Turn on "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
  </data>
  <data name="AutofillServices" xml:space="preserve">
-    <value>Storitve samodejnega izpolnjevanja</value>
+    <value>Auto-fill services</value>
  </data>
  <data name="InlineAutofill" xml:space="preserve">
    <value>Use inline autofill</value>
@@ -1871,7 +1871,7 @@ Scanning will happen automatically.</value>
    <value>An organization policy is affecting your ownership options.</value>
  </data>
  <data name="Send" xml:space="preserve">
-    <value>Pošiljke</value>
+    <value>Pošlji</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="AllSends" xml:space="preserve">
@@ -1887,23 +1887,23 @@ Scanning will happen automatically.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="Text" xml:space="preserve">
-    <value>Besedilo</value>
+    <value>Text</value>
  </data>
  <data name="TypeText" xml:space="preserve">
-    <value>Besedilo</value>
+    <value>Text</value>
  </data>
  <data name="TypeTextInfo" xml:space="preserve">
-    <value>Besedilo, ki ga želite poslati</value>
+    <value>The text you want to send.</value>
  </data>
  <data name="HideTextByDefault" xml:space="preserve">
    <value>When accessing the Send, hide the text by default</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="TypeFile" xml:space="preserve">
-    <value>Datoteka</value>
+    <value>File</value>
  </data>
  <data name="TypeFileInfo" xml:space="preserve">
-    <value>Datoteka, ki jo želite poslati</value>
+    <value>The file you want to send.</value>
  </data>
  <data name="FileTypeIsSelected" xml:space="preserve">
    <value>File type is selected.</value>
@@ -1998,7 +1998,7 @@ Scanning will happen automatically.</value>
    <value>Deli povezavo</value>
  </data>
  <data name="SendLink" xml:space="preserve">
-    <value>Povezava pošiljke</value>
+    <value>Pošlji povezavo</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SearchSends" xml:space="preserve">
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2156,22 +2150,22 @@ Scanning will happen automatically.</value>
    <value>One or more organization policies prevents your from exporting your individual vault.</value>
  </data>
  <data name="AddAccount" xml:space="preserve">
-    <value>Dodaj račun</value>
+    <value>Add account</value>
  </data>
  <data name="AccountUnlocked" xml:space="preserve">
-    <value>Odklenjen</value>
+    <value>Unlocked</value>
  </data>
  <data name="AccountLocked" xml:space="preserve">
-    <value>Zaklenjen</value>
+    <value>Locked</value>
  </data>
  <data name="AccountLoggedOut" xml:space="preserve">
-    <value>Odjavljen</value>
+    <value>Logged out</value>
  </data>
  <data name="AccountSwitchedAutomatically" xml:space="preserve">
    <value>Switched to next available account</value>
  </data>
  <data name="AccountLockedSuccessfully" xml:space="preserve">
-    <value>Račun je zaklenjen</value>
+    <value>Account locked</value>
  </data>
  <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
    <value>Account logged out successfully</value>
@@ -2195,7 +2189,7 @@ Scanning will happen automatically.</value>
    <value>Vaš račun je bil trajno izbrisan</value>
  </data>
  <data name="InvalidVerificationCode" xml:space="preserve">
-    <value>Neveljavna koda za preverjanje</value>
+    <value>Invalid verification code</value>
  </data>
  <data name="RequestOTP" xml:space="preserve">
    <value>Request one-time password</value>
@@ -2228,7 +2222,7 @@ Scanning will happen automatically.</value>
    <value>Enter the verification code that was sent to your email</value>
  </data>
  <data name="SubmitCrashLogs" xml:space="preserve">
-    <value>Pošlji zapisnike ob sesutju</value>
+    <value>Submit crash logs</value>
  </data>
  <data name="SubmitCrashLogsDescription" xml:space="preserve">
    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
@@ -2240,16 +2234,16 @@ Scanning will happen automatically.</value>
    <value>Options are collapsed, tap to expand.</value>
  </data>
  <data name="UppercaseAtoZ" xml:space="preserve">
-    <value>Velike črke (A-Z)</value>
+    <value>Uppercase (A to Z)</value>
  </data>
  <data name="LowercaseAtoZ" xml:space="preserve">
-    <value>Male črke (a-z)</value>
+    <value>Lowercase (A to Z)</value>
  </data>
  <data name="NumbersZeroToNine" xml:space="preserve">
    <value>Numbers (0 to 9)</value>
  </data>
  <data name="SpecialCharacters" xml:space="preserve">
-    <value>Posebni znaki (!@#$%^&amp;*)</value>
+    <value>Special characters (!@#$%^&amp;*)</value>
  </data>
  <data name="TapToGoBack" xml:space="preserve">
    <value>Tap to go back</value>
@@ -2264,31 +2258,31 @@ Scanning will happen automatically.</value>
    <value>Filter items by vault</value>
  </data>
  <data name="AllVaults" xml:space="preserve">
-    <value>Vsi trezorji</value>
+    <value>All vaults</value>
  </data>
  <data name="Vaults" xml:space="preserve">
-    <value>Trezorji</value>
+    <value>Vaults</value>
  </data>
  <data name="VaultFilterDescription" xml:space="preserve">
-    <value>Trezor: {0}</value>
+    <value>Vault: {0}</value>
  </data>
  <data name="All" xml:space="preserve">
-    <value>Vsi</value>
+    <value>All</value>
  </data>
  <data name="Totp" xml:space="preserve">
    <value>TOTP</value>
  </data>
  <data name="VerificationCodes" xml:space="preserve">
-    <value>Kode za preverjanje</value>
+    <value>Verification codes</value>
  </data>
  <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>Potrebna je naročnina Premium.</value>
+    <value>Premium subscription required</value>
  </data>
  <data name="CannotAddAuthenticatorKey" xml:space="preserve">
    <value>Cannot add authenticator key? </value>
  </data>
  <data name="ScanQRCode" xml:space="preserve">
-    <value>Skeniraj QR-kodo</value>
+    <value>Scan QR Code</value>
  </data>
  <data name="CannotScanQRCode" xml:space="preserve">
    <value>Cannot scan QR Code? </value>
@@ -2319,10 +2313,10 @@ select Add TOTP to store the key safely</value>
    <value>We were unable to process your request. Please try again or contact us.</value>
  </data>
  <data name="AllowScreenCapture" xml:space="preserve">
-    <value>Dovoli posnetke zaslona</value>
+    <value>Allow screen capture</value>
  </data>
  <data name="AreYouSureYouWantToEnableScreenCapture" xml:space="preserve">
-    <value>Ste prepričani, da želite dovoliti zajemanje zaslona?</value>
+    <value>Are you sure you want to turn on screen capture?</value>
  </data>
  <data name="LogInRequested" xml:space="preserve">
    <value>Login requested</value>
@@ -2337,46 +2331,46 @@ select Add TOTP to store the key safely</value>
    <value>Device type</value>
  </data>
  <data name="IpAddress" xml:space="preserve">
-    <value>IP-naslov</value>
+    <value>IP address</value>
  </data>
  <data name="Time" xml:space="preserve">
-    <value>Čas</value>
+    <value>Time</value>
  </data>
  <data name="Near" xml:space="preserve">
-    <value>Blizu</value>
+    <value>Near</value>
  </data>
  <data name="ConfirmLogIn" xml:space="preserve">
-    <value>Potrdi prijavo</value>
+    <value>Confirm login</value>
  </data>
  <data name="DenyLogIn" xml:space="preserve">
-    <value>Zavrni prijavo</value>
+    <value>Deny login</value>
  </data>
  <data name="JustNow" xml:space="preserve">
-    <value>Pravkar</value>
+    <value>Just now</value>
  </data>
  <data name="XMinutesAgo" xml:space="preserve">
-    <value>Pred {0} minutami</value>
+    <value>{0} minutes ago</value>
  </data>
  <data name="LogInAccepted" xml:space="preserve">
-    <value>Prijava potrjena</value>
+    <value>Login confirmed</value>
  </data>
  <data name="LogInDenied" xml:space="preserve">
-    <value>Prijava zavrnjena</value>
+    <value>Login denied</value>
  </data>
  <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>Odobri zahtevke za prijavo</value>
+    <value>Approve login requests</value>
  </data>
  <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>S to napravo odobri zahtevke za prijavo, ki pridejo z drugih naprav.</value>
+    <value>Use this device to approve login requests made from other devices.</value>
  </data>
  <data name="AllowNotifications" xml:space="preserve">
-    <value>Dovoli obvestila</value>
+    <value>Allow notifications</value>
  </data>
  <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
    <value>Receive push notifications for new login requests</value>
  </data>
  <data name="NoThanks" xml:space="preserve">
-    <value>Ne, hvala</value>
+    <value>No thanks</value>
  </data>
  <data name="ConfimLogInAttempForX" xml:space="preserve">
    <value>Confirm login attempt for {0}</value>
@@ -2385,10 +2379,10 @@ select Add TOTP to store the key safely</value>
    <value>All notifications</value>
  </data>
  <data name="PasswordType" xml:space="preserve">
-    <value>Vrsta gesla</value>
+    <value>Password type</value>
  </data>
  <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>Kaj želite generirati?</value>
+    <value>What would you like to generate?</value>
  </data>
  <data name="UsernameType" xml:space="preserve">
    <value>Username type</value>
@@ -2444,7 +2438,7 @@ select Add TOTP to store the key safely</value>
    <value>Are you sure you want to overwrite the current username?</value>
  </data>
  <data name="GenerateUsername" xml:space="preserve">
-    <value>Generiraj uporabniško ime</value>
+    <value>Generate username</value>
  </data>
  <data name="EmailType" xml:space="preserve">
    <value>Email Type</value>
@@ -2477,13 +2471,13 @@ select Add TOTP to store the key safely</value>
    <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
  </data>
  <data name="Accept" xml:space="preserve">
-    <value>Sprejmi</value>
+    <value>Accept</value>
  </data>
  <data name="Decline" xml:space="preserve">
-    <value>Zavrni</value>
+    <value>Decline</value>
  </data>
  <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>Zahtevek za prijavo je že potekel.</value>
+    <value>Login request has already expired.</value>
  </data>
  <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
    <value>Login attempt from:
@@ -2491,109 +2485,109 @@ select Add TOTP to store the key safely</value>
 Do you want to switch to this account?</value>
  </data>
  <data name="NewAroundHere" xml:space="preserve">
-    <value>Ste novi tukaj?</value>
+    <value>New around here?</value>
  </data>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>Pridobi namig za glavno geslo</value>
+    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
-    <value>To niste vi?</value>
+    <value>Not you?</value>
  </data>
  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>Prijava z glavnim geslom</value>
+    <value>Log in with master password</value>
  </data>
  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>Prijava z napravo</value>
+    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Prijava sprožena</value>
+    <value>Log in initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>Na vašo napravo smo poslali obvestilo.</value>
+    <value>A notification has been sent to your device.</value>
  </data>
  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Prosimo, preverite, da je vaš trezor odklenjem in da se identifikacijski gesli na tej in drugi napravi ujemata.</value>
+    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
  </data>
  <data name="ResendNotification" xml:space="preserve">
-    <value>Ponovno pošlji obvestilo</value>
+    <value>Resend notification</value>
  </data>
  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>Potrebujete drugačno možnost?</value>
+    <value>Need another option?</value>
  </data>
  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>Prikaži vse možnosti prijave</value>
+    <value>View all log in options</value>
  </data>
  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>Ta zahtevek ni več veljaven</value>
+    <value>This request is no longer valid</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>Čakajoči zahtevki za prijavo</value>
+    <value>Pending login requests</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
-    <value>Zavrni vse zahtevke</value>
+    <value>Decline all requests</value>
  </data>
  <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>Ste prepričani, da želite zavrniti vse čakajoče zahtevke za prijavo?</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>Zahtevki zavrnjeni</value>
+    <value>Requests declined</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>Ni zahtevkov</value>  
+    <value>No pending requests</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Za uporabo skenerja dovolite uporabo kamere</value>
+    <value>Enable camera permission to use the scanner</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>Jezik</value>
+    <value>Language</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>Spremenjeno v jezik {0}. Prosimo, ponovno zaženite aplikacijo za prikaz sprememb.</value>
+    <value>The language has been changed to {0}. Please restart the app to see the change</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Za spremembo jezika je potrebno ponovno zagnati aplikacijo.</value>
+    <value>Language change requires app restart</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>Privzet (sistemski)</value>
+    <value>Default (System)</value>
  </data>
  <data name="Important" xml:space="preserve">
-    <value>Pomembno</value>
+    <value>Important</value>
  </data>
  <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>Če pozabite glavno geslo, ga ne bo mogoče obnoviti! Vsaj {0} znakov.</value>
+    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
  </data>
  <data name="WeakMasterPassword" xml:space="preserve">
-    <value>Šibko glavno geslo</value>
+    <value>Weak Master Password</value>
  </data>
  <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
-    <value>Vaše geslo je šibko. Za zaščito svojega računa potrebujete močno geslo. Ste prepričani, da želite uporabiti šibko geslo?</value>
+    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
  </data>
  <data name="Weak" xml:space="preserve">
-    <value>Šibko</value>
+    <value>Weak</value>
  </data>
  <data name="Good" xml:space="preserve">
-    <value>Dobro</value>
+    <value>Good</value>
  </data>
  <data name="Strong" xml:space="preserve">
-    <value>Močno</value>
+    <value>Strong</value>
  </data>
  <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
-    <value>Preveri, ali je bilo geslo izpostavljeno v krajah podatkov</value>
+    <value>Check known data breaches for this password</value>
  </data>
  <data name="ExposedMasterPassword" xml:space="preserve">
-    <value>Izpostavljeno glavno geslo</value>
+    <value>Exposed Master Password</value>
  </data>
  <data name="PasswordFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>To geslo smo našli med ukradenimi gesli. Za zaščito svojega računa uporabite edinstveno geslo. Ste prepričani, da želite uporabiti izpostavljeno geslo?</value>
+    <value>Password found in a data breach. Use a unique password to protect your account. Are you sure you want to use an exposed password?</value>
  </data>
  <data name="WeakAndExposedMasterPassword" xml:space="preserve">
-    <value>Šibko in izpostavljeno glavno geslo</value>
+    <value>Weak and Exposed Master Password</value>
  </data>
  <data name="WeakPasswordIdentifiedAndFoundInADataBreachAlertDescription" xml:space="preserve">
-    <value>Vaše geslo je šibko, poleg tega smo ga našli med ukradenimi gesli. Za zaščito svojega računa potrebujete močno in edinstveno geslo. Ste prepričani, da želite uporabiti to šibko geslo?</value>
+    <value>Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?</value>
  </data>
  <data name="OrganizationSsoIdentifierRequired" xml:space="preserve">
    <value>Organization SSO identifier required.</value>
@@ -2602,33 +2596,12 @@ Do you want to switch to this account?</value>
    <value>Add the key to an existing or new item</value>
  </data>
  <data name="ThereAreNoItemsInYourVaultThatMatchX" xml:space="preserve">
-    <value>V vašem trezorju ni elementov, ki bi ustrezali "{0}"</value>
+    <value>There are no items in your vault that match "{0}"</value>
  </data>
  <data name="SearchForAnItemOrAddANewItem" xml:space="preserve">
-    <value>Poišči element ali dodaj novega</value>
+    <value>Search for an item or add a new item</value>
  </data>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
-    <value>Ni elementov, ki bi ustrezali iskanju</value>
-  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Trenutno glavno geslo</value>
+    <value>There are no items that match the search</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.sr.resx
+++ b/src/App/Resources/AppResources.sr.resx
@@ -1752,11 +1752,11 @@
    <value>Стварно послати у отпад?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Биометријско откључавање је онемогућено до верификације главне лозинке.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Откривена је биометријска промена, пријавите се помоћу главне лозинке да бисте је поново омогућили.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Биометријско откључавање аутоматског попуњавања за овај налог је онемогућено до верификације главне лозинке.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Биометријско откључавање је онемогућено до верификације главне лозинке.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Омогући синхронизацију при освежавању</value>
@@ -2144,12 +2144,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Полиса ваше организације утиче на време истека сефа. Максимално дозвољено време истека је {0} сат(и) и {1} minut(а)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Смернице ваше организације утичу на временско ограничење сефа. Максимално дозвољено ограничење сефа је {0} сат(и) и {1} минут(а). Ваша радња временског ограничења сефа је подешена на {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Смернице ваше организације су поставиле вашу радњу временског ограничења сефа на {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Време истека вашег сефа је премашило дозвољена ограничења од стране ваше организације.</value>
  </data>
@@ -2497,8 +2491,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Добити савет за Главну Лозинку</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Пријављено као {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Пријављивање као {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Не ти?</value>
@@ -2611,25 +2605,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Нема ставки које одговарају претрази</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Личан хостинг</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регион података</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регион</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ваша главна лозинка не испуњава једну или више смерница ваше организације. Да бисте приступили сефу, морате одмах да ажурирате главну лозинку. Ако наставите, одјавићете се са ваше тренутне сесије, што захтева да се поново пријавите. Активне сесије на другим уређајима могу да остану активне до један сат.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Тренутна главна лозинка</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.sv.resx
+++ b/src/App/Resources/AppResources.sv.resx
@@ -1753,11 +1753,11 @@ Skanningen sker automatiskt.</value>
    <value>Vill du verkligen skicka till papperskorgen?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometrisk upplåsning är inaktiverad i väntan på bekräftelse av huvudlösenordet.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometrisk upplåsning för automatisk ifyllnad är inaktiverad i väntan på bekräftelse av huvudlösenordet.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Aktivera synkronisering vid uppdatering</value>
@@ -2144,12 +2144,6 @@ Skanningen sker automatiskt.</value>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>Dina organisationsprinciper påverkar ditt valvs tid för timeout. Maximal tillåten tid innan timeout är {0} timme(ar) och {1} minut(er)</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Ditt valvs tid för timeout överskrider de begränsningar som fastställts av din organisation.</value>
  </data>
@@ -2497,8 +2491,8 @@ Vill du byta till detta konto?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Hämta huvudlösenordsledtråd</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Loggar in som {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Är det inte du?</value>
@@ -2611,25 +2605,4 @@ Vill du byta till detta konto?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Det finns inga objekt som matchar sökningen</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Nuvarande huvudlösenord</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.ta.resx
+++ b/src/App/Resources/AppResources.ta.resx
@@ -190,7 +190,7 @@
    <comment>Full label for a email address.</comment>
  </data>
  <data name="EmailUs" xml:space="preserve">
-    <value>எமக்கு மின்னஞ்சலிடு</value>
+    <value>எங்களுக்கு மின்னஞ்சலிடு</value>
  </data>
  <data name="EmailUsDescription" xml:space="preserve">
    <value>நேரடியாக உதவி பெற அ கருத்து தெரிவிக்க எங்களுக்கு மின்னஞ்சலிடு</value>
@@ -229,7 +229,7 @@
    <value>கோப்புறைகள்</value>
  </data>
  <data name="FolderUpdated" xml:space="preserve">
-    <value>கோப்புறை சேமிக்கப்பட்டது</value>
+    <value>கோப்புறை புதுப்பிக்கப்பட்டது.</value>
  </data>
  <data name="GoToWebsite" xml:space="preserve">
    <value>வலைத்தளத்திற்குச் செல்</value>
@@ -300,7 +300,7 @@
    <comment>The title for the vault page.</comment>
  </data>
  <data name="Authenticator" xml:space="preserve">
-    <value>அங்கீகரிப்பாளர்</value>
+    <value>Authenticator</value>
    <comment>Authenticator TOTP feature</comment>
  </data>
  <data name="Name" xml:space="preserve">
@@ -342,7 +342,7 @@
    <comment>Reveal a hidden value (password).</comment>
  </data>
  <data name="ItemDeleted" xml:space="preserve">
-    <value>உருப்படி நீக்கப்பட்டது</value>
+    <value>உருப்படி நீக்கப்பட்டது.</value>
    <comment>Confirmation message after successfully deleting a login.</comment>
  </data>
  <data name="Submit" xml:space="preserve">
@@ -364,7 +364,7 @@
    <comment>Label for a uri/url.</comment>
  </data>
  <data name="UseFingerprintToUnlock" xml:space="preserve">
-    <value>கைரேகை பயன்படுத்தி பூட்டவிழ்</value>
+    <value>கைரேகையைப் பயன்படுத்தி பூட்டவிழ்</value>
  </data>
  <data name="Username" xml:space="preserve">
    <value>பயனர்பெயர்</value>
@@ -375,7 +375,7 @@
    <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
  </data>
  <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} நகலெடுக்கப்பட்டது</value>
+    <value>{0} நகலெடுக்கப்பட்டது.</value>
    <comment>Confirmation message after successfully copying a value to the clipboard.</comment>
  </data>
  <data name="VerifyFingerprint" xml:space="preserve">
@@ -431,7 +431,7 @@
    <value>Bitwarden செயலி நீட்டிப்பு</value>
  </data>
  <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>உம் பெட்டகத்திற்கு புதிய உள்நுழைவுகளைச் சேர்ப்பதற்கான மிக எளிய வழி பிட்வார்டன் செயலி நீட்டிப்பிலிருந்தே. "அமைப்புகள்" திரைக்குச் சென்று பிட்வார்டன் செயலி நீட்டிப்பைப் பயன்படுத்துவது பற்றி மேலுமறிக.</value>
+    <value>உங்கள் பெட்டகத்திற்கு புதிய உள்நுழைவுகளைச் சேர்ப்பதற்கான மிக எளிய வழி பிட்வார்டன் செயலி நீட்டிப்பு மூலமே. "அமைப்புகள்" திரைக்கு செல்வதன் மூலம் பிட்வார்டன் செயலி நீட்டிப்பைப் பயன்படுத்துவது பற்றி மேலுமறிக.</value>
  </data>
  <data name="BitwardenAppExtensionDescription" xml:space="preserve">
    <value>Safari மற்றும் பிற செயலிகளில் உமது உள்நுழைவுகளைத் தன்னிரப்ப Bitwardenஐப் பயன்படுத்து.</value>
@@ -461,7 +461,7 @@
    <value>தொடர்</value>
  </data>
  <data name="CreateAccount" xml:space="preserve">
-    <value>கணக்கை உருவாக்கு</value>
+    <value>கணக்கு உருவாக்கு</value>
  </data>
  <data name="CreatingAccount" xml:space="preserve">
    <value>கணக்கை உருவாக்குகிறது...</value>
@@ -471,7 +471,7 @@
    <value>உருப்படியைத் திருத்து</value>
  </data>
  <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>தானியங்கு ஒத்திசைவை அனுமதி</value>
+    <value>தானியங்கு ஒத்திசைவை இயக்கு</value>
  </data>
  <data name="EnterEmailForHint" xml:space="preserve">
    <value>உமது பிரதான கடவுச்சொல் குறிப்பைப் பெற உமது கணக்கு மின்னஞ்சல் முகவரியை உள்ளிடு.</value>
@@ -529,7 +529,7 @@
    <value>உங்கள் உருப்படிகளை மற்ற கடவுச்சொல் நிர்வாக செயலிகளிலிருந்து விரைவாக மொத்த இறக்குமதி செய்க.</value>
  </data>
  <data name="LastSync" xml:space="preserve">
-    <value>கடந்த ஒத்திசைவு:</value>
+    <value>கடந்த ஒத்திசைவு: </value>
  </data>
  <data name="Length" xml:space="preserve">
    <value>நீளம்</value>
@@ -584,7 +584,7 @@
    <value>உங்கள் கடவுச்சொல்லை மறந்துவிட்டால் அதை நினைவுபடுத்த பிரதான கடவுச்சொல் குறிப்பு உதவும்.</value>
  </data>
  <data name="MasterPasswordLengthValMessageX" xml:space="preserve">
-    <value>பிரதான கடவுச்சொல் குறைந்தது {0} வரியுருக்கள் இருக்க வேண்டும்.</value>
+    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
    <value>குறைந்தபட்ச எண்கள்</value>
@@ -678,10 +678,10 @@
    <value>செயலியைத் திறக்க 4 இலக்க கடவெண் குறியை உள்ளிடு.</value>
  </data>
  <data name="ItemInformation" xml:space="preserve">
-    <value>உருப்படித் தகவல்</value>
+    <value>உருப்படியின் தகவல்</value>
  </data>
  <data name="ItemUpdated" xml:space="preserve">
-    <value>உருப்படி சேமிக்கப்பட்டது</value>
+    <value>உருப்படி புதுப்பிக்கப்பட்டது.</value>
  </data>
  <data name="Submitting" xml:space="preserve">
    <value>சமர்ப்பிக்கிறது...</value>
@@ -692,10 +692,10 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="SyncingComplete" xml:space="preserve">
-    <value>ஒத்திசைவு நிறைவு</value>
+    <value>ஒத்திசைவு நிறைவடைந்தது.</value>
  </data>
  <data name="SyncingFailed" xml:space="preserve">
-    <value>ஒத்திசைவு தோல்வி</value>
+    <value>ஒத்திசைவு தோல்வி.</value>
  </data>
  <data name="SyncVaultNow" xml:space="preserve">
    <value>இப்போது பெட்டகத்தை ஒத்திசை</value>
@@ -901,8 +901,8 @@
    <value>அங்கீகார விசையை படிக்க இயலவில்லை.</value>
  </data>
  <data name="PointYourCameraAtTheQRCode" xml:space="preserve">
-    <value>படக்கருவியை விரைவுக்குறியில் சுட்டிக்காட்டுக.
-விருடல் தானாக நடக்கும்.</value>
+    <value>Point your camera at the QR Code.
+Scanning will happen automatically.</value>
  </data>
  <data name="ScanQrTitle" xml:space="preserve">
    <value>வி.ம(QR) குறியீட்டை வருடல் செய்க</value>
@@ -917,7 +917,7 @@
    <value>TOTP ஐ நகலெடு</value>
  </data>
  <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
-    <value>ஓர் உள்நுழைவிடம் ஆங்கீகரிப்பு விசை இருந்தால், நீங்கள் உள்நுழைவை தன்னிரப்பும்போது TOTP சிரிபார்ப்புக் குறியீட்டை நகலெடுக்கவும்.</value>
+    <value>If a login has an authenticator key, copy the TOTP verification code to your clip-board when you auto-fill the login.</value>
  </data>
  <data name="CopyTotpAutomatically" xml:space="preserve">
    <value>TOTPஐத் தானாக நகலெடு</value>
@@ -1144,7 +1144,7 @@
    <value>வலைத்தள படவுருக்களைக் காட்டு</value>
  </data>
  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
-    <value>ஒவ்வொரு உள்நுழைவுக்கு அடுத்தும் அறியம்படியான படத்தைக் காட்டு.</value>
+    <value>Show a recognizable image next to each login.</value>
  </data>
  <data name="IconsUrl" xml:space="preserve">
    <value>படவுரு தேக்க உரலி</value>
@@ -1580,20 +1580,20 @@
    <comment>'Nord' is the name of a specific color scheme. It should not be translated.</comment>
  </data>
  <data name="SolarizedDark" xml:space="preserve">
-    <value>சோலரைஸ்டு இருள்</value>
+    <value>Solarized Dark</value>
    <comment>'Solarized Dark' is the name of a specific color scheme. It should not be translated.</comment>
  </data>
  <data name="AutofillBlockedUris" xml:space="preserve">
-    <value>தடுக்கப்பட்ட உரலிகளைத் தன்னிரப்பு</value>
+    <value>Auto-fill blocked URIs</value>
  </data>
  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
-    <value>தடுக்கப்பட்ட உரலிகளுக்கு தன்னிரப்பல் அளிக்கப்படா. பல உரலிகள் காற்புள்ளியுடன் பிரிக்கவும். எ.கா:"https://twitter.com, androidapp://com.twitter.android".</value>
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
  </data>
  <data name="AskToAddLogin" xml:space="preserve">
    <value>உள்நுழைவைச் சேர்க்க கேள்</value>
  </data>
  <data name="AskToAddLoginDescription" xml:space="preserve">
-    <value>உமது பெட்டகத்தில் உருப்படி இல்லையெனில் சேர்க்க கேள்.</value>
+    <value>Ask to add an item if one isn't found in your vault.</value>
  </data>
  <data name="OnRestart" xml:space="preserve">
    <value>செயலி மறுதொடக்கத்தில்</value>
@@ -1753,11 +1753,11 @@
    <value>நீங்கள் உண்மையில் குப்பைக்கு அனுப்ப விரும்புகிறீர்களா?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>இக்கணக்கிற்கான உயிரியளவு பூட்டவிழ்த்தல் முடக்கப்பட்டது பிரதான கடவுச்சொல் சரிபார்ப்பு நிலுவையிலுள்ளது.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>உயிரியளவு பூட்டவிழ்த்தல் முடக்கப்பட்டது பிரதான கடவுச்சொல் சரிபார்ப்பு நிலுவையிலுள்ளது.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>தன்னிரப்பலுக்கான உயிரியளவு பூட்டவிழ்த்தல் முடக்கப்பட்டது பிரதான கடவுச்சொல் சரிபார்ப்பு நிலுவையிலுள்ளது.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>புத்துணர்வூட்டலில் ஒத்திசைவை இயக்கு</value>
@@ -2143,12 +2143,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவைப் பாதிக்கிறது. அனுமதிக்கப்பட்ட அதிகபட்ச பெட்டக நேரமுடிவு {0} மணிநேரம் மற்றும் {1} நிமிடம(கள்) ஆகும்</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவைப் பாதிக்கிறது. அனுமதிக்கப்பட்ட அதிகபட்ச பெட்டக நேரமுடிவு {0} மணிநேரம் மற்றும் {1} நிமிடம(கள்) ஆகும். உம் பெட்டக நேரமுடிவுச் செயல் {2} என அமைக்கப்ப்பட்டுள்ளது.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>உம் நிறுவன கொள்கைகள் உம் பெட்டக நேரமுடிவு செயலை {0} என அமைத்துள்ளன.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>உமது பெட்டக நேரமுடிவு உம் நிறுவனம் அமைத்த கட்டுப்பாடுகளை தாண்டுகிறது.</value>
  </data>
@@ -2231,7 +2225,7 @@
    <value>சிதைவுக்குறிப்புகளைச் சமர்ப்பி</value>
  </data>
  <data name="SubmitCrashLogsDescription" xml:space="preserve">
-    <value>சிதைவு அறிக்கைகளைச் சமர்ப்பித்துச் செயலி உறுதிநிலையை மேம்படுத்த Bitwardenக்கு உதவுக.</value>
+    <value>Help Bitwarden improve app stability by submitting crash reports.</value>
  </data>
  <data name="OptionsExpanded" xml:space="preserve">
    <value>தெரிவுகள் விரிவாகின, சுருக்கத் தட்டு.</value>
@@ -2279,25 +2273,25 @@
    <value>TOTP</value>
  </data>
  <data name="VerificationCodes" xml:space="preserve">
-    <value>சரிபார்ப்பு குறியீடுகள்</value>
+    <value>Verification codes</value>
  </data>
  <data name="PremiumSubscriptionRequired" xml:space="preserve">
-    <value>உயர்தரச் சந்தா தேவை</value>
+    <value>Premium subscription required</value>
  </data>
  <data name="CannotAddAuthenticatorKey" xml:space="preserve">
-    <value>அங்கீகரிப்பான் விசையைச் சேர்க்க முடியவில்லையா? </value>
+    <value>Cannot add authenticator key? </value>
  </data>
  <data name="ScanQRCode" xml:space="preserve">
-    <value>விரைவுக்குறியை வருடு</value>
+    <value>Scan QR Code</value>
  </data>
  <data name="CannotScanQRCode" xml:space="preserve">
-    <value>விரைவுக்குறியை வருட முடியவில்லையா? </value>
+    <value>Cannot scan QR Code? </value>
  </data>
  <data name="AuthenticatorKeyScanner" xml:space="preserve">
-    <value>அங்கீகரிப்பான் விசை</value>
+    <value>Authenticator key</value>
  </data>
  <data name="EnterKeyManually" xml:space="preserve">
-    <value>கைமுறையாக விசையை உள்ளிடு</value>
+    <value>Enter key manually</value>
  </data>
  <data name="AddTotp" xml:space="preserve">
    <value>Add TOTP</value>
@@ -2325,73 +2319,73 @@ select Add TOTP to store the key safely</value>
    <value>திரைப்பிடிப்பை நிச்சயமாக இயக்கவா?</value>
  </data>
  <data name="LogInRequested" xml:space="preserve">
-    <value>உள்நுழைவு கோரப்பட்டது</value>
+    <value>Login requested</value>
  </data>
  <data name="AreYouTryingToLogIn" xml:space="preserve">
-    <value>உள்நுழைய முயல்கிறீரா?</value>
+    <value>Are you trying to log in?</value>
  </data>
  <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>{0} ஆல் {1} இல் உள்நுழைவு முயற்சி</value>
+    <value>Login attempt by {0} on {1}</value>
  </data>
  <data name="DeviceType" xml:space="preserve">
-    <value>சாதன வகை</value>
+    <value>Device type</value>
  </data>
  <data name="IpAddress" xml:space="preserve">
-    <value>IP முகவரி</value>
+    <value>IP address</value>
  </data>
  <data name="Time" xml:space="preserve">
-    <value>நேரம்</value>
+    <value>Time</value>
  </data>
  <data name="Near" xml:space="preserve">
    <value>Near</value>
  </data>
  <data name="ConfirmLogIn" xml:space="preserve">
-    <value>உள்நுழைவை உறுதிபடுத்து</value>
+    <value>Confirm login</value>
  </data>
  <data name="DenyLogIn" xml:space="preserve">
-    <value>உள்நுழைவை மறு</value>
+    <value>Deny login</value>
  </data>
  <data name="JustNow" xml:space="preserve">
    <value>Just now</value>
  </data>
  <data name="XMinutesAgo" xml:space="preserve">
-    <value>{0} நிமிடங்கள் முன்பு</value>
+    <value>{0} minutes ago</value>
  </data>
  <data name="LogInAccepted" xml:space="preserve">
-    <value>உள்நுழைவு உறுதிபடுத்தப்பட்டது</value>
+    <value>Login confirmed</value>
  </data>
  <data name="LogInDenied" xml:space="preserve">
-    <value>உள்நுழைவு மறுக்கப்பட்டது</value>
+    <value>Login denied</value>
  </data>
  <data name="ApproveLoginRequests" xml:space="preserve">
-    <value>உள்நுழைவு கோரிக்கைகளை ஒப்புக்கொள்</value>
+    <value>Approve login requests</value>
  </data>
  <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>பிற சாதனங்களிலிருந்து செய்யப்பட்ட உள்நுழைவு கோரிக்கைகளை ஒப்புக்கொள்ள இச்சாதனத்தைப் பயன்படுத்து.</value>
+    <value>Use this device to approve login requests made from other devices.</value>
  </data>
  <data name="AllowNotifications" xml:space="preserve">
-    <value>அறிவிப்புகளை அனுமதி</value>
+    <value>Allow notifications</value>
  </data>
  <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
-    <value>புது உள்நுழைவு கோரிக்கைகளுக்கு push அறிவிப்புகளைப் பெறு</value>
+    <value>Receive push notifications for new login requests</value>
  </data>
  <data name="NoThanks" xml:space="preserve">
-    <value>பரவாயில்லை வேண்டாம்</value>
+    <value>No thanks</value>
  </data>
  <data name="ConfimLogInAttempForX" xml:space="preserve">
-    <value>{0}-க்கான உள்நுழைவு முயற்சியை உறுதுபடுத்து</value>
+    <value>Confirm login attempt for {0}</value>
  </data>
  <data name="AllNotifications" xml:space="preserve">
-    <value>எல்லா அறிவிப்புகளும்</value>
+    <value>All notifications</value>
  </data>
  <data name="PasswordType" xml:space="preserve">
-    <value>கடவுச்சொல் வகை</value>
+    <value>Password type</value>
  </data>
  <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>என்ன உருவாக்க விரும்புகிறீர்?</value>
+    <value>What would you like to generate?</value>
  </data>
  <data name="UsernameType" xml:space="preserve">
-    <value>பயனர்பெயர் வகை</value>
+    <value>Username type</value>
  </data>
  <data name="PlusAddressedEmail" xml:space="preserve">
    <value>Plus addressed email</value>
@@ -2477,108 +2471,108 @@ select Add TOTP to store the key safely</value>
    <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
  </data>
  <data name="Accept" xml:space="preserve">
-    <value>ஏற்றுக்கொள்</value>
+    <value>Accept</value>
  </data>
  <data name="Decline" xml:space="preserve">
-    <value>மறு</value>
+    <value>Decline</value>
  </data>
  <data name="LoginRequestHasAlreadyExpired" xml:space="preserve">
-    <value>உள்நுழைவு கோரிக்கை ஏற்கனவே காலாவதியானது.</value>
+    <value>Login request has already expired.</value>
  </data>
  <data name="LoginAttemptFromXDoYouWantToSwitchToThisAccount" xml:space="preserve">
-    <value>இதிலிருந்து உள்நுழைவு முயற்சி:
+    <value>Login attempt from:
 {0}
-இக்கணக்கிற்கு மாற வேண்டுமா?</value>
+Do you want to switch to this account?</value>
  </data>
  <data name="NewAroundHere" xml:space="preserve">
    <value>New around here?</value>
  </data>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
-    <value>பிரதான கடவுச்சொல் குறிப்பைப் பெறு</value>
+    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} இல் {0} ஆக உள்நுழைகிறது</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
-    <value>நீங்கள் இல்லையா?</value>
+    <value>Not you?</value>
  </data>
  <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>பிரதான கடவுச்சொலுடன் உள்நுழை</value>
+    <value>Log in with master password</value>
  </data>
  <data name="LogInWithAnotherDevice" xml:space="preserve">
-    <value>சாதனத்துடன் உள்நுழை</value>
+    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>உள்நுழைவு துவங்கியது</value>
+    <value>Log in initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
-    <value>உமது சாதனத்திற்கு ஓரறிவிப்பு அனுப்பப்பட்டது.</value>
+    <value>A notification has been sent to your device.</value>
  </data>
  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
    <value>Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device.</value>
  </data>
  <data name="ResendNotification" xml:space="preserve">
-    <value>அறிவிப்பை மீண்டுமனுப்பு</value>
+    <value>Resend notification</value>
  </data>
  <data name="NeedAnotherOption" xml:space="preserve">
-    <value>வேறு வருப்பம் தேவையா?</value>
+    <value>Need another option?</value>
  </data>
  <data name="ViewAllLoginOptions" xml:space="preserve">
-    <value>எல்லா உள்நுழைவு விருப்பத்தையும் காண்க</value>
+    <value>View all log in options</value>
  </data>
  <data name="ThisRequestIsNoLongerValid" xml:space="preserve">
-    <value>இக்கோரிக்கை இனி செல்லாது</value>
+    <value>This request is no longer valid</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>நிலுவையிலுள்ள உள்நுழைவு கோரிக்கைகள்</value>
+    <value>Pending login requests</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
-    <value>எல்லா கோரிக்கைகளையும் மறு</value>
+    <value>Decline all requests</value>
  </data>
  <data name="AreYouSureYouWantToDeclineAllPendingLogInRequests" xml:space="preserve">
-    <value>நிலுவையிலுள்ள எல்லா கோரிக்கைகளையும் மறுக்க வேண்டுமா?</value>
+    <value>Are you sure you want to decline all pending login requests?</value>
  </data>
  <data name="RequestsDeclined" xml:space="preserve">
-    <value>கோரிக்கைகள் மறுக்கப்பட்டன</value>
+    <value>Requests declined</value>
  </data>
  <data name="NoPendingRequests" xml:space="preserve">
-    <value>நிலுவையிலுள்ள கோரிக்கைகள் இல்லை</value>  
+    <value>No pending requests</value>  
  </data>
  <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>வருடியைப் பயன்படுத்த படக்கருவி அனுமதியை இயக்கு</value>
+    <value>Enable camera permission to use the scanner</value>
  </data>
  <data name="Language" xml:space="preserve">
-    <value>மொழி</value>
+    <value>Language</value>
  </data>
  <data name="LanguageChangeXDescription" xml:space="preserve">
-    <value>மொழி {0}-க்கு மாற்றப்பட்டது. மாற்றத்தைக் காண செயலியை மறுதுவக்கு</value>
+    <value>The language has been changed to {0}. Please restart the app to see the change</value>
  </data>
  <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>மொழிமாற்றத்திற்கு செயலி மறுதுவக்கப்பட வேண்டும்</value>
+    <value>Language change requires app restart</value>
  </data>
  <data name="DefaultSystem" xml:space="preserve">
-    <value>இயல்புநிலை (முறைமை)</value>
+    <value>Default (System)</value>
  </data>
  <data name="Important" xml:space="preserve">
-    <value>முக்கியம்</value>
+    <value>Important</value>
  </data>
  <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
-    <value>மறந்துபோனால் பிரதான கடவுச்சொல்லை மீட்டெடுக்க முடியாது! குறைந்தபட்சம் {0} வரியுருக்கள்.</value>
+    <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
  </data>
  <data name="WeakMasterPassword" xml:space="preserve">
-    <value>வலுவற்ற பிரதான கடவுச்சொல்</value>
+    <value>Weak Master Password</value>
  </data>
  <data name="WeakPasswordIdentifiedUseAStrongPasswordToProtectYourAccount" xml:space="preserve">
    <value>Weak password identified. Use a strong password to protect your account. Are you sure you want to use a weak password?</value>
  </data>
  <data name="Weak" xml:space="preserve">
-    <value>வலுவற்ற</value>
+    <value>Weak</value>
  </data>
  <data name="Good" xml:space="preserve">
-    <value>நல்ல</value>
+    <value>Good</value>
  </data>
  <data name="Strong" xml:space="preserve">
-    <value>வலுவான</value>
+    <value>Strong</value>
  </data>
  <data name="CheckKnownDataBreachesForThisPassword" xml:space="preserve">
    <value>Check known data breaches for this password</value>
@@ -2610,25 +2604,4 @@ select Add TOTP to store the key safely</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>அமெரிக்க ஐக்கிய நாடுகள்</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ஐரோப்பிய ஒன்றியம்</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>தரவு இடம்</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>இடம்</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.te.resx
+++ b/src/App/Resources/AppResources.te.resx
@@ -1752,11 +1752,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2141,13 +2141,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2496,8 +2490,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2610,25 +2604,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.th.resx
+++ b/src/App/Resources/AppResources.th.resx
@@ -1759,11 +1759,11 @@ Scanning will happen automatically.</value>
    <value>Do you really want to send to the trash?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biometric unlock disabled pending verification of master password.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Biometric unlock for autofill disabled pending verification of master password.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Allow sync on refresh</value>
@@ -2148,13 +2148,7 @@ Scanning will happen automatically.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2503,8 +2497,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Not you?</value>
@@ -2617,25 +2611,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.tr.resx
+++ b/src/App/Resources/AppResources.tr.resx
@@ -1752,11 +1752,11 @@ Kod otomatik olarak taranacaktır.</value>
    <value>Bu kaydı çöp kutusuna göndermek istediğinizden emin misiniz?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Bu hesap için biyometrik kilit açma devre dışı. Ana parolanın doğrulanması bekleniyor.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Biyometrik kilit açma devre dışı. Ana parolanın doğrulanması bekleniyor.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Otomatik doldurma biyometrik kilit açma devre dışı. Ana parolanın doğrulanması bekleniyor.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Otomatik doldurma için biyometrik kilit açma devre dışı. Ana parolanın doğrulanması bekleniyor.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Yenileme sırasında eşitlemeye izin ver</value>
@@ -2140,13 +2140,7 @@ Kod otomatik olarak taranacaktır.</value>
    <value>Bu kuruluşun sizi otomatik olarak parola sıfırlamaya ekleyen bir ilkesi bulunmakta. Bu ilkeye eklenmek, kuruluş yöneticilerinin ana parolanızı değiştirebilmesini sağlar.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Kuruluş ilkeleriniz izin verilen maksimum kasa zaman aşımını {0} saat {1} dakika olarak belirlemiş.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Kuruluş ilkeleriniz kasa zaman aşımınızı etkiliyor. İzin verilen maksimum kasa zaman aşımı {0} saat {1} dakikadır. Kasa zaman aşımı eyleminiz {2} olarak ayarlanmış.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Kuruluş ilkeleriniz kasa zaman aşımı eyleminizi {0} olarak ayarlamış.</value>
+    <value>Kuruluş ilkeleriniz kasa zaman aşımınızı etkiliyor. İzin verilen maksimum kasa zaman aşımı {0} saat {1} dakikadır</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Kasa zaman aşımınız, kuruluşunuz tarafından belirlenen kısıtlamaları aşıyor.</value>
@@ -2494,8 +2488,8 @@ Bu hesaba geçmek ister misiniz?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Ana parola ipucunu al</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>{1} üzerinde {0} olarak giriş yapılıyor</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olarak giriş yapılıyor</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Siz değil misiniz?</value>
@@ -2608,25 +2602,4 @@ Bu hesaba geçmek ister misiniz?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Aramayla eşleşen kayıt yok</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>ABD</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>AB</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Barındırılan</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Veri bölgesi</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Bölge</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ana parolanız kuruluş ilkelerinizi karşılamıyor. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Mevcut ana parola</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.uk.resx
+++ b/src/App/Resources/AppResources.uk.resx
@@ -1752,11 +1752,11 @@
    <value>Ви дійсно хочете перенести до смітника?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Біометричне розблокування для цього облікового запису вимкнено. Очікується перевірка головного пароля.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Біометричне розблокування вимкнено. Очікується перевірка головного пароля.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Біометричне розблокування під час автозаповнення для цього облікового запису вимкнено. Очікується перевірка головного пароля.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Біометричне розблокування для автозаповнення вимкнено. Очікується перевірка головного пароля.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Дозволити синхронізацію жестом</value>
@@ -2140,13 +2140,7 @@
    <value>Ця організація має корпоративну політику, яка автоматично розгортає вас на скидання пароля. Розгортання дозволятиме адміністраторам організації змінювати ваш головний пароль.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Політикою вашої організації встановлено максимальний дозволений час очікування сховища {0} годин, {1} хвилин.</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Політики вашої організації впливають на час очікування сховища. Максимальний дозволений час очікування сховища {0} годин, {1} хвилин. Для часу очікування вашого сховища встановлена дія {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Політикою вашої організації встановлено дію для часу очікування сховища {0}.</value>
+    <value>Політики вашої організації впливають на час очікування сховища. Максимальний дозволений час очікування сховища {0} годин, {1} хвилин</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Час очікування сховища перевищує обмеження, встановлені вашою організацією.</value>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Отримати підказку для головного пароля</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Вхід як {0} на {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вхід у систему як {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Не ви?</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>Немає записів, що відповідають пошуку</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>США</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>ЄС</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Власне розміщення</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Регіон даних</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Регіон</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Ваш головний пароль не відповідає одній або більше політикам вашої організації. Щоб отримати доступ до сховища, вам необхідно оновити свій головний пароль зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Поточний головний пароль</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.vi.resx
+++ b/src/App/Resources/AppResources.vi.resx
@@ -1752,11 +1752,11 @@ Quá trình quét sẽ diễn ra tự động.</value>
    <value>Bạn có thực sự muốn đưa vào thùng rác?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>Xác thực sinh trắc học bị vô hiệu hoá trong khi chờ xác minh mật khẩu chính.</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>Phương thức xác thực sinh trắc học bị vô hiệu hóa do cần xác nhận mật khẩu chính.</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>Kích hoạt đồng bộ khi làm tươi(refresh)</value>
@@ -2140,13 +2140,7 @@ Quá trình quét sẽ diễn ra tự động.</value>
    <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your maximum allowed vault timeout to {0} hour(s) and {1} minute(s).</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
+    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s)</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>Your vault timeout exceeds the restrictions set by your organization.</value>
@@ -2495,8 +2489,8 @@ Do you want to switch to this account?</value>
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>Get master password hint</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Đăng nhập với {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>Không phải bạn?</value>
@@ -2609,25 +2603,4 @@ Do you want to switch to this account?</value>
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour.</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>Current master password</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.zh-Hans.resx
+++ b/src/App/Resources/AppResources.zh-Hans.resx
@@ -1752,11 +1752,11 @@
    <value>您确定要将其发送到回收站吗？</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>在验证主密码之前，此账户的生物识别解锁将禁用。</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>生物识别解锁已禁用，等待验证主密码。</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>在验证主密码之前，此账户的自动填充生物识别解锁将禁用。</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>在验证主密码之前，用于自动填充的生物识别解锁功能将禁用。</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>启用刷新时同步</value>
@@ -2140,13 +2140,7 @@
    <value>此组织有一个企业策略，将为您自动注册密码重置。注册后将允许组织管理员更改您的主密码。</value>
  </data>
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
-    <value>您的组织策略已将您最大允许的密码库超时时间设置为 {0} 小时 {1} 分钟。</value>
-  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 {0} 小时 {1} 分钟。您的密码库超时动作被设置为 {2}。</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>您的组织策略已将您的密码库超时动作设置为 {0}。</value>
+    <value>您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 {0} 小时 {1} 分钟</value>
  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>您的密码库超时时间超出了组织设置的限制。</value>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>获取主密码提示</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>在 {1} 上以 {0} 身份登录</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>正登录为 {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>不是你？</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>没有匹配搜索条件的项目</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>美国</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>欧盟</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>自托管</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>数据区域</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>区域</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>当前主密码</value>
-  </data>
 </root>
--- a/src/App/Resources/AppResources.zh-Hant.resx
+++ b/src/App/Resources/AppResources.zh-Hant.resx
@@ -1752,11 +1752,11 @@
    <value>您確定要傳送至垃圾桶嗎？</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
-  <data name="AccountBiometricInvalidated" xml:space="preserve">
-    <value>Biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidated" xml:space="preserve">
+    <value>已停用生物特徵辨識解鎖功能，請先驗證主密碼。</value>
  </data>
-  <data name="AccountBiometricInvalidatedExtension" xml:space="preserve">
-    <value>Autofill biometric unlock for this account is disabled pending verification of master password.</value>
+  <data name="BiometricInvalidatedExtension" xml:space="preserve">
+    <value>在驗證主密碼之前，用於自動填入的生物特徵辨識解鎖將暫時停用。</value>
  </data>
  <data name="EnableSyncOnRefresh" xml:space="preserve">
    <value>啟用重新整理時同步</value>
@@ -2142,12 +2142,6 @@
  <data name="VaultTimeoutPolicyInEffect" xml:space="preserve">
    <value>您的組織原則正在影響您的密碼庫逾時時間。密碼庫逾時時間最多可以設定到 {0} 小時 {1} 分鐘。</value>
  </data>
-  <data name="VaultTimeoutPolicyWithActionInEffect" xml:space="preserve">
-    <value>Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is {0} hour(s) and {1} minute(s). Your vault timeout action is set to {2}.</value>
-  </data>
-  <data name="VaultTimeoutActionPolicyInEffect" xml:space="preserve">
-    <value>Your organization policies have set your vault timeout action to {0}.</value>
-  </data>
  <data name="VaultTimeoutToLarge" xml:space="preserve">
    <value>您的密碼庫逾時時間超過組織設定的限制。</value>
  </data>
@@ -2495,8 +2489,8 @@
  <data name="GetMasterPasswordwordHint" xml:space="preserve">
    <value>獲取主密碼提示</value>
  </data>
-  <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>正登入為 {0}</value>
  </data>
  <data name="NotYou" xml:space="preserve">
    <value>不是您嗎？</value>
@@ -2529,7 +2523,7 @@
    <value>此請求已失效</value>
  </data>
  <data name="PendingLogInRequests" xml:space="preserve">
-    <value>待處理的登入請求。</value>
+    <value>Pending login requests</value>
  </data>
  <data name="DeclineAllRequests" xml:space="preserve">
    <value>Decline all requests</value>
@@ -2609,25 +2603,4 @@
  <data name="ThereAreNoItemsThatMatchTheSearch" xml:space="preserve">
    <value>There are no items that match the search</value>
  </data>
-  <data name="US" xml:space="preserve">
-    <value>US</value>
-  </data>
-  <data name="EU" xml:space="preserve">
-    <value>EU</value>
-  </data>
-  <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
-  </data>
-  <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
-  </data>
-  <data name="Region" xml:space="preserve">
-    <value>Region</value>
-  </data>
-  <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
-    <value>您的主密碼不符合您的組織政策之一或多個要求。您必須立即更新您的主密碼以存取密碼庫。進行此操作將登出您目前的工作階段，需要您重新登入。其他裝置上的工作階段可能繼續長達一小時。</value>
-  </data>
-  <data name="CurrentMasterPassword" xml:space="preserve">
-    <value>目前主密碼</value>
-  </data>
 </root>
--- a/src/App/Services/MobilePlatformUtilsService.cs
+++ b/src/App/Services/MobilePlatformUtilsService.cs
@@ -6,7 +6,6 @@ using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Utilities;
 using Plugin.Fingerprint;
 using Plugin.Fingerprint.Abstractions;
 using Xamarin.Essentials;
@@ -227,20 +226,6 @@ namespace Bit.App.Services
            }
        }

-        public async Task<bool> IsBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
-        {
-            bioIntegritySrcKey ??= Core.Constants.BiometricIntegritySourceKey;
-
-            var biometricService = ServiceContainer.Resolve<IBiometricService>();
-            if (!await biometricService.IsSystemBiometricIntegrityValidAsync(bioIntegritySrcKey))
-            {
-                return false;
-            }
-
-            var stateService = ServiceContainer.Resolve<IStateService>();
-            return await stateService.IsAccountBiometricIntegrityValidAsync(bioIntegritySrcKey);
-        }
-
        public async Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null,
            Action fallback = null)
        {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hinton	4bdbc30873	Dylib	2023-04-27 14:38:32 +02:00
Hinton	39bfda0a24	Add linking instruction everywhere	2023-04-24 15:44:41 +02:00
Hinton	3172b0d571	Use aarch64-apple-ios instead	2023-04-24 15:17:52 +02:00
Hinton	464d1f8a9a	test	2023-04-24 14:57:12 +02:00