[PM-3340] Change settings screen vault timeout action cell UI.

[PM-3606] TDE user with 2FA isn't able to autofill on iOS (#2723 )
* [PM-3606] Fix 2FA for autofill * [PM-3606] Fix autofill when user doesn't have a login method available. * [PM-3606] PR fixes * [PM-3606] Add logout logic to other extension projects * [PM-3606] Move code to base class. * Transform into property instead of field Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * Remove double ";" Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3606] Fix iOS extension by changing base class of LockPasswordViewController --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
2025-12-05 23:53:33 +00:00 · 2023-09-13 17:28:03 +01:00 · 2023-09-09 17:38:14 -04:00 · 2023-09-08 15:23:51 +01:00 · 2023-09-08 09:33:37 +00:00 · 2023-09-08 07:48:37 +01:00
219 changed files with 8352 additions and 3484 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,29 @@
+# Please sort lines alphabetically, this will ensure we don't accidentally add duplicates.
+#
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# The following owners will be the default owners for everything in the repo.
+# Unless a later match takes precedence
+# @bitwarden/tech-leads
+
+## Auth team files ##
+
+## Platform team files ##
+appIcons @bitwarden/team-platform-dev
+build.cake @bitwarden/team-platform-dev
+
+## Vault team files ##
+src/watchOS @bitwarden/team-vault-dev
+
+## Tools team files ##
+src/Core/Services/EmailForwarders @bitwarden/team-tools-dev
+
+
+## Crowdin Sync files ##
+src/App/Resources @bitwarden/tech-leads
+src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization @bitwarden/tech-leads
+
+## Locales ## 
+src/App/Resources/AppResources.Designer.cs
+src/App/Resources/AppResources.resx
+src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -525,7 +525,7 @@ jobs:
          submodules: 'true'

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

@@ -667,6 +667,22 @@ jobs:
          $configuration = "AppStore";
          $platform = "iPhone";

+          Write-Output "########################################"
+          Write-Output "##### Archive $configuration Configuration for $platform Platform"
+          Write-Output "########################################"
+          msbuild "$($env:GITHUB_WORKSPACE + "/src/iOS/iOS.csproj")" "/p:Platform=$platform" `
+            "/p:Configuration=$configuration" "/p:ArchiveOnBuild=true" "/t:`"Build`""
+
+          Write-Output "########################################"
+          Write-Output "##### Done"
+          Write-Output "########################################"
+        shell: pwsh
+
+      - name: Archive Build for Mobile Automation
+        run: |
+          $configuration = "Release";
+          $platform = "iPhoneSimulator";
+
          Write-Output "########################################"
          Write-Output "##### Archive $configuration Configuration for $platform Platform"
          Write-Output "########################################"
@@ -689,6 +705,15 @@ jobs:
            -exportOptionsPlist $EXPORT_OPTIONS_PATH
        shell: bash

+      - name: Export .app for Automation CI
+        run: |
+          ARCHIVE_PATH="./src/iOS/bin/iPhoneSimulator/Release/BitwardeniOS.app"
+          EXPORT_PATH="./bitwarden-export"
+
+          zip -r -q BitwardeniOS.app.zip $ARCHIVE_PATH
+          mv BitwardeniOS.app.zip $EXPORT_PATH
+        shell: bash
+
      - name: Copy all dSYMs files to upload
        run: |
          ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
@@ -711,6 +736,13 @@ jobs:
            ./bitwarden-export/dSYMs/*.*
          if-no-files-found: error

+      - name: Upload .app file for Automation CI
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
+        with:
+          name: BitwardeniOS.app.zip
+          path: ./bitwarden-export/BitwardeniOS.app.zip
+          if-no-files-found: error
+
      - name: Install AppCenter CLI
        if: |
          (github.ref == 'refs/heads/master'
@@ -779,7 +811,7 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

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

@@ -845,7 +877,7 @@ jobs:
          fi

      - name: Login to Azure - CI Subscription
-        uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf # v1.4.3
+        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.6
        if: failure()
        with:
          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -18,13 +18,13 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

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

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        with:
          keyvault: "bitwarden-ci"
          secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -12,6 +12,6 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b  # v4.0.3
+      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
        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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

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

      - name: Create release
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01  # v1.9.0
+        uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5  # v1.13.0
        with:
          artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                      ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -126,7 +126,7 @@ jobs:
    if: inputs.fdroid_publish
    steps:
      - name: Checkout repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

      - name: Download F-Droid .apk artifact
        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -147,9 +147,9 @@ jobs:
          name: com.x8bit.bitwarden-fdroid.apk

      - name: Set up Node
-        uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561  # v2.5.1
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d  # v3.8.1
        with:
-          node-version: '10.x'
+          node-version: '16.x'

      - name: Set up F-Droid server
        run: |
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: 'Run stale action'
-        uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358  # v5.0.0
+        uses: actions/stale@f7176fd3007623b69d27091f9b9d4ab7995f0a06  # v5.2.1
        with:
          stale-issue-label: 'needs-reply'
          stale-pr-label: 'needs-changes'
--- 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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

      - name: Calculate bumped version
        id: version
@@ -35,7 +35,5 @@ jobs:
    name: Bump version to ${{ needs.setup.outputs.version_number }}
    needs: setup
    uses: ./.github/workflows/version-bump.yml
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
    with:
      version_number: ${{ needs.setup.outputs.version_number }}
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -12,9 +12,6 @@ on:
      version_number:
        required: true
        type: string
-    secrets:
-      AZURE_PROD_KV_CREDENTIALS:
-        required: true

 jobs:
  bump_version:
@@ -22,22 +19,22 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout Branch
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

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

      - name: Retrieve secrets
        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@34ecb67b2a357795dc893549df0795e7383ff50f
+        uses: bitwarden/gh-actions/get-keyvault-secrets@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        with:
          keyvault: "bitwarden-ci"
          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@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7 # v5.4.0
        with:
          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
          passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
@@ -48,31 +45,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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
        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@4a7ddc1b38ca5cb4e3e43578f4df5cabe4f55a67
--- a/bitwarden-mobile.sln
+++ b/bitwarden-mobile.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "src\App\App.csproj", "{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4B8A8C41-9820-4341-974C-41E65B7F4366}"
@@ -30,15 +32,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Publisher", "store\google\Publisher\Publisher.csproj", "{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{599E0201-420A-4C3E-A7BA-5349F72E0B15}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Extension\iOS.Extension.csproj", "{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj", "{599E0201-420A-4C3E-A7BA-5349F72E0B15}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.ShareExtension", "src\iOS.ShareExtension\iOS.ShareExtension.csproj", "{F8C3F648-EA5A-4719-8005-85D1690B1655}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iOS.Core.csproj", "{E71F3053-056C-4381-9638-048ED73BDFF6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "src\Android\Android.csproj", "{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,6 +65,51 @@ Global
 		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Deploy.0 = FDroid|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
 		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
@@ -191,6 +242,91 @@ Global
 		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhone.Build.0 = Release|Any CPU
 		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|iPhone
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|Any CPU.Build.0 = AppStore|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Build.0 = Debug|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.ActiveCfg = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|Any CPU.Build.0 = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhone.Build.0 = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.ActiveCfg = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhone.Build.0 = Release|iPhone
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -251,111 +387,83 @@ Global
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|Any CPU.Build.0 = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.AppStore|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhone.Build.0 = Debug|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.ActiveCfg = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|Any CPU.Build.0 = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.ActiveCfg = FDroid|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhone.Build.0 = FDroid|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.FDroid|iPhoneSimulator.Build.0 = FDroid|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.ActiveCfg = Release|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhone.Build.0 = Release|iPhone
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhone.Build.0 = Debug|iPhone
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhone.Build.0 = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E71F3053-056C-4381-9638-048ED73BDFF6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|Any CPU.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhone.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.ActiveCfg = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.FDroid|iPhoneSimulator.Build.0 = FDroid|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhone.Build.0 = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.ActiveCfg = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhone.Build.0 = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.AppStore|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhone.Build.0 = Debug|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhone.Build.0 = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.FDroid|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|Any CPU.Build.0 = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.ActiveCfg = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhone.Build.0 = Release|iPhone
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{F8C3F648-EA5A-4719-8005-85D1690B1655}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|Any CPU.Build.0 = AppStore|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Build.0 = Debug|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.ActiveCfg = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|Any CPU.Build.0 = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.ActiveCfg = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhone.Build.0 = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.FDroid|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.ActiveCfg = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.Build.0 = Release|iPhone
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{4B8A8C41-9820-4341-974C-41E65B7F4366} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{9C8DA5A8-904D-466F-B9B0-1A4AB5A9AFC3} = {8904C536-C67D-420F-9971-51B26574C3AA}
 		{2E399654-26A2-46F6-B9CA-1B496A3F370A} = {92470CBD-9047-4C3C-8EA3-D972D6622D84}
 		{256F9E44-0AF5-4D97-A2F9-DA26080C0A5D} = {2E399654-26A2-46F6-B9CA-1B496A3F370A}
+		{E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA}
 		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA}
-		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{E71F3053-056C-4381-9638-048ED73BDFF6} = {D10CA4A9-F866-40E1-B658-F69051236C71}
-		{304400AF-F0ED-40FA-B102-EA3C3EC43E4F} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{F8C3F648-EA5A-4719-8005-85D1690B1655} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
--- a/global.json
+++ b/global.json
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.306"
-  }
-}
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <TargetFrameworks>net7.0-android</TargetFrameworks>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{304400AF-F0ED-40FA-B102-EA3C3EC43E4F}</ProjectGuid>
    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
    <RootNamespace>Bit.Droid</RootNamespace>
    <AssemblyName>BitwardenAndroid</AssemblyName>
    <AndroidApplication>True</AndroidApplication>
@@ -16,13 +15,10 @@
    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
-    <Configurations>Debug;Release;FDroid</Configurations>
-    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -66,46 +62,39 @@
    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
  </PropertyGroup>
  <ItemGroup>
-    <!--<Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android" />
    <Reference Include="Mono.Android.Export" />
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />-->
+    <Reference Include="System.Xml" />
    <Reference Include="System.Net.Http" Condition="'$(Configuration)'=='FDroid'" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4">
+    <PackageReference Include="Plugin.CurrentActivity">
+      <Version>2.1.0.4</Version>
    </PackageReference>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0">
+    <PackageReference Include="Portable.BouncyCastle">
+      <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.MediaRouter" Version="1.3.1.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.5">
-    </PackageReference>
-    <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.1.1.1">
-    </PackageReference>
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Google.Dagger" Version="2.44.2.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.3">
-    </PackageReference>-->
-
-
-    <!--<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.3.0.3" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
-    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.5" />
-    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.0.1" />
-    <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />-->
-
-    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
-    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
+    <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.21" />
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
+    <PackageReference Include="Xamarin.Essentials">
+      <Version>1.8.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Firebase.Messaging">
+      <Version>123.1.2.2</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
+    <PackageReference Include="Xamarin.Google.Dagger" Version="2.46.1.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
+      <Version>118.0.1.5</Version>
+    </PackageReference>
  </ItemGroup>
-  <!--<ItemGroup>
+  <ItemGroup>
    <Compile Include="Accessibility\AccessibilityActivity.cs" />
    <Compile Include="Accessibility\AccessibilityHelpers.cs" />
    <Compile Include="Accessibility\Credentials.cs" />
@@ -171,7 +160,7 @@
    <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
    <Compile Include="Services\WatchDeviceService.cs" />
    <Compile Include="Renderers\CustomLabelRenderer.cs" />
-  </ItemGroup>-->
+  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\bwi-font.ttf" />
    <AndroidAsset Include="Assets\RobotoMono_Regular.ttf" />
@@ -262,10 +251,12 @@
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\App\App.csproj">
-      <ReferenceSourceTarget></ReferenceSourceTarget>
+      <Project>{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}</Project>
+      <Name>App</Name>
    </ProjectReference>
    <ProjectReference Include="..\Core\Core.csproj">
-      <ReferenceSourceTarget></ReferenceSourceTarget>
+      <Project>{4b8a8c41-9820-4341-974c-41e65b7f4366}</Project>
+      <Name>Core</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
@@ -324,12 +315,5 @@
    <Folder Include="Resources\drawable-v26\" />
    <Folder Include="Resources\drawable-night-v26\" />
  </ItemGroup>
-  <Target BeforeTargets="_CheckForTransitiveWindowsDesktopDependencies" Name="_FixSdkError_NETSDK1136">
-    <ItemGroup>
-      <TransitiveFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
-      <TransitiveFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
-      <TransitiveFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
-    </ItemGroup>
-  </Target>
-  <!--<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />-->
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -22,9 +22,9 @@ using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
 using Bit.Core.Enums;
-//#if !FDROID
-//using Android.Gms.Security;
-//#endif
+#if !FDROID
+using Android.Gms.Security;
+#endif

 namespace Bit.Droid
 {
@@ -37,7 +37,7 @@ namespace Bit.Droid
 #if FDROID
    public class MainApplication : Application
 #else
-    public class MainApplication : Application //, ProviderInstaller.IProviderInstallListener
+    public class MainApplication : Application, ProviderInstaller.IProviderInstallListener
 #endif
    {
        public MainApplication(IntPtr handle, JniHandleOwnership transer)
@@ -68,9 +68,9 @@ namespace Bit.Droid
                ServiceContainer.Register<IDeleteAccountActionFlowExecutioner>("deleteAccountActionFlowExecutioner", deleteAccountActionFlowExecutioner);

                var verificationActionsFlowHelper = new VerificationActionsFlowHelper(
-                    ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService"),
                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    ServiceContainer.Resolve<ICryptoService>("cryptoService"));
+                    ServiceContainer.Resolve<ICryptoService>("cryptoService"),
+                    ServiceContainer.Resolve<IUserVerificationService>());
                ServiceContainer.Register<IVerificationActionsFlowHelper>("verificationActionsFlowHelper", verificationActionsFlowHelper);

                var accountsManager = new AccountsManager(
@@ -86,12 +86,12 @@ namespace Bit.Droid
                    ServiceContainer.Resolve<IConditionedAwaiterManager>());
                ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
            }
-//#if !FDROID
-//            if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
-//            {
-//                ProviderInstaller.InstallIfNeededAsync(ApplicationContext, this);
-//            }
-//#endif
+#if !FDROID
+            if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
+            {
+                ProviderInstaller.InstallIfNeededAsync(ApplicationContext, this);
+            }
+#endif
        }

        public override void OnCreate()
@@ -156,10 +156,10 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
-            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
+            var biometricService = new BiometricService(stateService, cryptoService);
+            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);

            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
--- 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.7.1" 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.8.1" 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/Push/FirebaseMessagingService.cs
+++ b/src/Android/Push/FirebaseMessagingService.cs
@@ -1,60 +1,60 @@
-//#if !FDROID
-//using System;
-//using Android.App;
-//using Bit.App.Abstractions;
-//using Bit.Core.Abstractions;
-//using Bit.Core.Services;
-//using Bit.Core.Utilities;
-//using Firebase.Messaging;
-//using Newtonsoft.Json;
-//using Newtonsoft.Json.Linq;
-//using Xamarin.Forms;
+#if !FDROID
+using System;
+using Android.App;
+using Bit.App.Abstractions;
+using Bit.Core.Abstractions;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Firebase.Messaging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xamarin.Forms;

-//namespace Bit.Droid.Push
-//{
-//    [Service(Exported=false)]
-//    [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
-//    public class FirebaseMessagingService : Firebase.Messaging.FirebaseMessagingService
-//    {
-//        public async override void OnNewToken(string token)
-//        {
-//            try { 
-//                var stateService = ServiceContainer.Resolve<IStateService>("stateService");
-//                var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
+namespace Bit.Droid.Push
+{
+    [Service(Exported=false)]
+    [IntentFilter(new[] { "com.google.firebase.MESSAGING_EVENT" })]
+    public class FirebaseMessagingService : Firebase.Messaging.FirebaseMessagingService
+    {
+        public async override void OnNewToken(string token)
+        {
+            try { 
+                var stateService = ServiceContainer.Resolve<IStateService>("stateService");
+                var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
            
-//                await stateService.SetPushRegisteredTokenAsync(token);
-//                await pushNotificationService.RegisterAsync();
-//            }
-//            catch (Exception ex)
-//            {
-//                Logger.Instance.Exception(ex);
-//            }
-//        }
+                await stateService.SetPushRegisteredTokenAsync(token);
+                await pushNotificationService.RegisterAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.Instance.Exception(ex);
+            }
+        }
        
-//        public async override void OnMessageReceived(RemoteMessage message)
-//        {
-//            try
-//            {
-//                if (message?.Data == null)
-//                {
-//                    return;
-//                }
-//                var data = message.Data.ContainsKey("data") ? message.Data["data"] : null;
-//                if (data == null)
-//                {
-//                    return;
-//                }
+        public async override void OnMessageReceived(RemoteMessage message)
+        {
+            try
+            {
+                if (message?.Data == null)
+                {
+                    return;
+                }
+                var data = message.Data.ContainsKey("data") ? message.Data["data"] : null;
+                if (data == null)
+                {
+                    return;
+                }

-//                var obj = JObject.Parse(data);
-//                var listener = ServiceContainer.Resolve<IPushNotificationListenerService>(
-//                    "pushNotificationListenerService");
-//                await listener.OnMessageAsync(obj, Device.Android);
-//            }
-//            catch (Exception ex)
-//            {
-//                Logger.Instance.Exception(ex);
-//            }
-//        }
-//    }
-//}
-//#endif
+                var obj = JObject.Parse(data);
+                var listener = ServiceContainer.Resolve<IPushNotificationListenerService>(
+                    "pushNotificationListenerService");
+                await listener.OnMessageAsync(obj, Device.Android);
+            }
+            catch (Exception ex)
+            {
+                Logger.Instance.Exception(ex);
+            }
+        }
+    }
+}
+#endif
--- a/src/Android/Resources/values/attrs.xml
+++ b/src/Android/Resources/values/attrs.xml
@@ -1,5 +0,0 @@
-<resources>
-<declare-styleable name='SKCanvasView'>
-	<attr name='ignorePixelScaling' format='boolean'/>
-</declare-styleable>
-</resources>
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
+using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Java.Security;
@@ -9,10 +10,8 @@ using Javax.Crypto;

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

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

        private readonly KeyStore _keystore;

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

-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
@@ -41,7 +40,7 @@ namespace Bit.Droid.Services
            return true;
        }

-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
--- a/src/App/Abstractions/IPasswordRepromptService.cs
+++ b/src/App/Abstractions/IPasswordRepromptService.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Bit.Core.Enums;

 namespace Bit.App.Abstractions
 {
@@ -6,10 +7,8 @@ namespace Bit.App.Abstractions
    {
        string[] ProtectedFields { get; }

-        Task<bool> ShowPasswordPromptAsync();
+        Task<bool> PromptAndCheckPasswordIfNeededAsync(CipherRepromptType repromptType = CipherRepromptType.Password);

        Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
-
-        Task<bool> Enabled();
    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -16,9 +16,9 @@
    <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="Xamarin.Essentials" Version="1.8.0" />
    <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.2612" />
    <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/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -7,17 +7,17 @@ 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;
-using Xamarin.Essentials;
 using Xamarin.Forms;

 namespace Bit.App.Pages
 {
    public class HomeViewModel : BaseViewModel
    {
+        private const string LOGGING_IN_ON_US = "bitwarden.com";
+        private const string LOGGING_IN_ON_EU = "bitwarden.eu";
+
        private readonly IStateService _stateService;
        private readonly IMessagingService _messagingService;
        private readonly IPlatformUtilsService _platformUtilsService;
@@ -30,8 +30,6 @@ namespace Bit.App.Pages
        private bool _rememberEmail;
        private string _email;
        private string _selectedEnvironmentName;
-        private bool _isEmailEnabled;
-        private bool _canLogin;
        private bool _displayEuEnvironment;

        public HomeViewModel()
@@ -86,7 +84,7 @@ namespace Bit.App.Pages
            set => SetProperty(ref _selectedEnvironmentName, value);
        }

-        public string RegionText => $"{AppResources.Region}:";
+        public string RegionText => $"{AppResources.LoggingInOn}:";
        public bool CanContinue => !string.IsNullOrEmpty(Email);

        public FormattedString CreateAccountText
@@ -167,12 +165,12 @@ namespace Bit.App.Pages
        {
            _displayEuEnvironment = await _configService.GetFeatureFlagBoolAsync(Constants.DisplayEuEnvironmentFlag);
            var options = _displayEuEnvironment
-                    ? new string[] { AppResources.US, AppResources.EU, AppResources.SelfHosted }
-                    : new string[] { AppResources.US, AppResources.SelfHosted };
+                    ? new string[] { LOGGING_IN_ON_US, LOGGING_IN_ON_EU, AppResources.SelfHosted }
+                    : new string[] { LOGGING_IN_ON_US, AppResources.SelfHosted };

            await Device.InvokeOnMainThreadAsync(async () =>
            {
-                var result = await Page.DisplayActionSheet(AppResources.DataRegion, AppResources.Cancel, null, options);
+                var result = await Page.DisplayActionSheet(AppResources.LoggingInOn, AppResources.Cancel, null, options);

                if (result is null || result == AppResources.Cancel)
                {
@@ -185,7 +183,7 @@ namespace Bit.App.Pages
                    return;
                }

-                await _environmentService.SetUrlsAsync(result == AppResources.EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
+                await _environmentService.SetUrlsAsync(result == LOGGING_IN_ON_EU ? EnvironmentUrlData.DefaultEU : EnvironmentUrlData.DefaultUS);
                await _configService.GetAsync(true);
                SelectedEnvironmentName = result;
            });
@@ -198,17 +196,17 @@ namespace Bit.App.Pages
            {
                await _environmentService.SetUrlsAsync(EnvironmentUrlData.DefaultUS);
                environmentsSaved = EnvironmentUrlData.DefaultUS;
-                SelectedEnvironmentName = AppResources.US;
+                SelectedEnvironmentName = LOGGING_IN_ON_US;
                return;
            }

            if (environmentsSaved.Base == EnvironmentUrlData.DefaultUS.Base)
            {
-                SelectedEnvironmentName = AppResources.US;
+                SelectedEnvironmentName = LOGGING_IN_ON_US;
            }
            else if (environmentsSaved.Base == EnvironmentUrlData.DefaultEU.Base)
            {
-                SelectedEnvironmentName = AppResources.EU;
+                SelectedEnvironmentName = LOGGING_IN_ON_EU;
            }
            else
            {
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -46,7 +46,7 @@
                    <StackLayout StyleClass="box">
                        <Grid
                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock}"
+                            IsVisible="{Binding PinEnabled}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
@@ -89,7 +89,7 @@
                        <Grid
                            x:Name="_passwordGrid"
                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
+                            IsVisible="{Binding PinEnabled, Converter={StaticResource inverseBool}}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/LockPage.xaml.cs
+++ b/src/App/Pages/Accounts/LockPage.xaml.cs
@@ -20,13 +20,14 @@ namespace Bit.App.Pages
        private bool _promptedAfterResume;
        private bool _appeared;

-        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true)
+        public LockPage(AppOptions appOptions = null, bool autoPromptBiometric = true, bool checkPendingAuthRequests = true)
        {
            _appOptions = appOptions;
            _autoPromptBiometric = autoPromptBiometric;
            InitializeComponent();
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>();
            _vm = BindingContext as LockPageViewModel;
+            _vm.CheckPendingAuthRequests = checkPendingAuthRequests;
            _vm.Page = this;
            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());

@@ -44,7 +45,7 @@ namespace Bit.App.Pages
        {
            get
            {
-                if (_vm?.PinLock ?? false)
+                if (_vm?.PinEnabled ?? false)
                {
                    return _pin;
                }
@@ -54,7 +55,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAfterResumeAsync()
        {
-            if (_vm.BiometricLock)
+            if (_vm.BiometricEnabled)
            {
                await Task.Delay(500);
                if (!_promptedAfterResume)
@@ -91,13 +92,13 @@ namespace Bit.App.Pages

            _vm.FocusSecretEntry += PerformFocusSecretEntry;

-            if (!_vm.BiometricLock)
+            if (!_vm.BiometricEnabled)
            {
                RequestFocus(SecretEntry);
            }
            else
            {
-                if (_vm.UsingKeyConnector && !_vm.PinLock)
+                if (!_vm.HasMasterPassword && !_vm.PinEnabled)
                {
                    _passwordGrid.IsVisible = false;
                    _unlockButton.IsVisible = false;
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -27,27 +27,27 @@ namespace Bit.App.Pages
        private readonly IEnvironmentService _environmentService;
        private readonly IStateService _stateService;
        private readonly IBiometricService _biometricService;
-        private readonly IKeyConnectorService _keyConnectorService;
+        private readonly IUserVerificationService _userVerificationService;
        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 IDeviceTrustCryptoService _deviceTrustCryptoService;
+        private readonly ISyncService _syncService;
        private string _email;
        private string _masterPassword;
        private string _pin;
        private bool _showPassword;
-        private bool _pinLock;
-        private bool _biometricLock;
+        private PinLockType _pinStatus;
+        private bool _pinEnabled;
+        private bool _biometricEnabled;
        private bool _biometricIntegrityValid = true;
        private bool _biometricButtonVisible;
-        private bool _usingKeyConnector;
+        private bool _hasMasterPassword;
        private string _biometricButtonText;
        private string _loggedInAsText;
        private string _lockedVerifyText;
-        private bool _isPinProtected;
-        private bool _isPinProtectedWithKey;

        public LockPageViewModel()
        {
@@ -60,11 +60,13 @@ namespace Bit.App.Pages
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
            _policyService = ServiceContainer.Resolve<IPolicyService>();
            _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
+            _syncService = ServiceContainer.Resolve<ISyncService>();

            PageTitle = AppResources.VerifyMasterPassword;
            TogglePasswordCommand = new Command(TogglePassword);
@@ -100,21 +102,21 @@ namespace Bit.App.Pages
                });
        }

-        public bool PinLock
+        public bool PinEnabled
        {
-            get => _pinLock;
-            set => SetProperty(ref _pinLock, value);
+            get => _pinEnabled;
+            set => SetProperty(ref _pinEnabled, value);
        }

-        public bool UsingKeyConnector
+        public bool HasMasterPassword
        {
-            get => _usingKeyConnector;
+            get => _hasMasterPassword;
        }

-        public bool BiometricLock
+        public bool BiometricEnabled
        {
-            get => _biometricLock;
-            set => SetProperty(ref _biometricLock, value);
+            get => _biometricEnabled;
+            set => SetProperty(ref _biometricEnabled, value);
        }

        public bool BiometricIntegrityValid
@@ -147,6 +149,8 @@ namespace Bit.App.Pages
            set => SetProperty(ref _lockedVerifyText, value);
        }

+        public bool CheckPendingAuthRequests { get; set; }
+
        public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }

        public Command SubmitCommand { get; }
@@ -162,18 +166,32 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
-            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
-                      _isPinProtectedWithKey;
-            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
-
-            // Users with key connector and without biometric or pin has no MP to unlock with
-            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
-            if (_usingKeyConnector && !(BiometricLock || PinLock))
+            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
+            if (pendingRequest != null && CheckPendingAuthRequests)
            {
                await _vaultTimeoutService.LogOutAsync();
                return;
            }
+
+            _pinStatus = await _vaultTimeoutService.GetPinLockTypeAsync();
+
+            var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
+                ?? await _stateService.GetPinProtectedKeyAsync();
+            PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
+                      _pinStatus == PinLockType.Persistent;
+            BiometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _biometricService.CanUseBiometricsUnlockAsync();
+
+            // Users without MP and without biometric or pin has no MP to unlock with
+            _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
+            if (await _stateService.IsAuthenticatedAsync()
+                 && !_hasMasterPassword
+                 && !BiometricEnabled
+                 && !PinEnabled)
+            {
+                await _vaultTimeoutService.LogOutAsync();
+                return;
+            }
+
            _email = await _stateService.GetEmailAsync();
            if (string.IsNullOrWhiteSpace(_email))
            {
@@ -188,26 +206,18 @@ namespace Bit.App.Pages
            }
            var webVaultHostname = CoreHelpers.GetHostname(webVault);
            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
-            if (PinLock)
+            if (PinEnabled)
            {
                PageTitle = AppResources.VerifyPIN;
                LockedVerifyText = AppResources.VaultLockedPIN;
            }
            else
            {
-                if (_usingKeyConnector)
-                {
-                    PageTitle = AppResources.UnlockVault;
-                    LockedVerifyText = AppResources.VaultLockedIdentity;
-                }
-                else
-                {
-                    PageTitle = AppResources.VerifyMasterPassword;
-                    LockedVerifyText = AppResources.VaultLockedMasterPassword;
-                }
+                PageTitle = _hasMasterPassword ? AppResources.VerifyMasterPassword : AppResources.UnlockVault;
+                LockedVerifyText = _hasMasterPassword ? AppResources.VaultLockedMasterPassword : AppResources.VaultLockedIdentity;
            }

-            if (BiometricLock)
+            if (BiometricEnabled)
            {
                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
                if (!_biometricIntegrityValid)
@@ -229,14 +239,14 @@ namespace Bit.App.Pages

        public async Task SubmitAsync()
        {
-            if (PinLock && string.IsNullOrWhiteSpace(Pin))
+            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
                    AppResources.Ok);
                return;
            }
-            if (!PinLock && string.IsNullOrWhiteSpace(MasterPassword))
+            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
@@ -247,34 +257,54 @@ namespace Bit.App.Pages
            ShowPassword = false;
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));

-            if (PinLock)
+            if (PinEnabled)
            {
                var failed = true;
                try
                {
-                    if (_isPinProtected)
+                    EncString userKeyPin = null;
+                    EncString oldPinProtected = null;
+                    if (_pinStatus == PinLockType.Persistent)
                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
+                        var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
+                        oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
+                    }
+                    else if (_pinStatus == PinLockType.Transient)
+                    {
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
+                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
+                    }
+
+                    UserKey userKey;
+                    if (oldPinProtected != null)
+                    {
+                        userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
+                            _pinStatus == PinLockType.Transient,
+                            Pin,
+                            _email,
                            kdfConfig,
-                            await _stateService.GetPinProtectedKeyAsync());
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        failed = decPin != Pin;
-                        if (!failed)
-                        {
-                            Pin = string.Empty;
-                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                            await SetKeyAndContinueAsync(key);
-                        }
+                            oldPinProtected
+                        );
                    }
                    else
                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email, kdfConfig);
-                        failed = false;
+                        userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
+                            Pin,
+                            _email,
+                            kdfConfig,
+                            userKeyPin
+                        );
+                    }
+
+                    var protectedPin = await _stateService.GetProtectedPinAsync();
+                    var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
+                    failed = decryptedPin != Pin;
+                    if (!failed)
+                    {
                        Pin = string.Empty;
                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                        await SetKeyAndContinueAsync(key);
+                        await SetUserKeyAndContinueAsync(userKey);
                    }
                }
                catch
@@ -295,19 +325,21 @@ namespace Bit.App.Pages
            }
            else
            {
-                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
-                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
+                var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
+                var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
                var passwordValid = false;
                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
-                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
+                    // Offline unlock possible
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
                }
                else
                {
+                    // Online unlock required
                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+                    var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;

@@ -316,8 +348,8 @@ namespace Bit.App.Pages
                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
                        passwordValid = true;
-                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
-                        await _cryptoService.SetKeyHashAsync(localKeyHash);
+                        var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
                    }
                    catch (Exception e)
                    {
@@ -327,15 +359,6 @@ namespace Bit.App.Pages
                }
                if (passwordValid)
                {
-                    if (_isPinProtected)
-                    {
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        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
@@ -345,10 +368,13 @@ namespace Bit.App.Pages

                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                    await SetKeyAndContinueAsync(key);
+
+                    var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
+                    await _cryptoService.SetMasterKeyAsync(masterKey);
+                    await SetUserKeyAndContinueAsync(userKey);

                    // Re-enable biometrics
-                    if (BiometricLock & !BiometricIntegrityValid)
+                    if (BiometricEnabled & !BiometricIntegrityValid)
                    {
                        await _biometricService.SetupBiometricAsync();
                    }
@@ -425,7 +451,7 @@ namespace Bit.App.Pages
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
-            var secret = PinLock ? Pin : MasterPassword;
+            var secret = PinEnabled ? Pin : MasterPassword;
            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
        }

@@ -433,32 +459,35 @@ namespace Bit.App.Pages
        {
            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
            BiometricButtonVisible = BiometricIntegrityValid;
-            if (!BiometricLock || !BiometricIntegrityValid)
+            if (!BiometricEnabled || !BiometricIntegrityValid)
            {
                return;
            }
            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinLock ? AppResources.PIN : AppResources.MasterPassword,
+                PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
            await _stateService.SetBiometricLockedAsync(!success);
            if (success)
            {
-                await DoContinueAsync();
+                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
+                await SetUserKeyAndContinueAsync(userKey);
            }
        }

-        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
+        private async Task SetUserKeyAndContinueAsync(UserKey key)
        {
-            var hasKey = await _cryptoService.HasKeyAsync();
+            var hasKey = await _cryptoService.HasUserKeyAsync();
            if (!hasKey)
            {
-                await _cryptoService.SetKeyAsync(key);
+                await _cryptoService.SetUserKeyAsync(key);
            }
+            await _deviceTrustCryptoService.TrustDeviceIfNeededAsync();
            await DoContinueAsync();
        }

        private async Task DoContinueAsync()
        {
+            _syncService.FullSyncAsync(false).FireAndForget();
            await _stateService.SetBiometricLockedAsync(false);
            _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
            _messagingService.Send("unlocked");
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<pages:BaseContentPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Bit.App.Pages.LoginApproveDevicePage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:LoginApproveDeviceViewModel"
+    x:Name="_page"
+    Title="{Binding PageTitle}">
+    
+    <ContentPage.BindingContext>
+        <pages:LoginApproveDeviceViewModel />
+    </ContentPage.BindingContext>
+
+    <StackLayout Padding="10, 10">
+        <StackLayout Padding="5, 10" Orientation="Horizontal">
+            <StackLayout HorizontalOptions="FillAndExpand">
+                <Label
+                    StyleClass="text-md"
+                    Text="{u:I18n RememberThisDevice}"/>
+                <Label
+                    StyleClass="box-sub-label"
+                    Text="{u:I18n TurnOffUsingPublicDevice}"/>
+            </StackLayout>
+            <Switch
+                Scale="0.8"
+                IsToggled="{Binding RememberThisDevice}"
+                VerticalOptions="Center"/>
+        </StackLayout>
+        <StackLayout Margin="0, 20, 0, 0">
+            <Button
+                x:Name="_continue"
+                Text="{u:I18n Continue}" 
+                StyleClass="btn-primary"
+                Command="{Binding ContinueCommand}"
+                IsVisible="{Binding IsNewUser}"/>
+            <Button
+                x:Name="_approveWithMyOtherDevice"
+                Text="{u:I18n ApproveWithMyOtherDevice}" 
+                StyleClass="btn-primary"
+                Command="{Binding ApproveWithMyOtherDeviceCommand}"
+                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
+            <Button
+                x:Name="_requestAdminApproval"
+                Text="{u:I18n RequestAdminApproval}" 
+                StyleClass="box-button-row"
+                Command="{Binding RequestAdminApprovalCommand}"
+                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
+            <Button
+                x:Name="_approveWithMasterPassword"
+                Text="{u:I18n ApproveWithMasterPassword}" 
+                StyleClass="box-button-row"
+                Command="{Binding ApproveWithMasterPasswordCommand}"
+                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
+            <Label
+                Text="{Binding LoggingInAsText}"
+                StyleClass="text-sm"
+                Margin="0,40,0,0"
+                AutomationId="LoggingInAsLabel"
+                />
+            <Label
+                Text="{u:I18n NotYou}"
+                StyleClass="text-md"
+                HorizontalOptions="Start"
+                TextColor="{DynamicResource HyperlinkColor}"
+                AutomationId="NotYouLabel">
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding LogoutCommand}" />
+                </Label.GestureRecognizers>
+            </Label>
+        </StackLayout>
+    </StackLayout>
+</pages:BaseContentPage>
+
+
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.App.Models;
+using Bit.App.Utilities;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class LoginApproveDevicePage : BaseContentPage
+    {
+
+        private readonly LoginApproveDeviceViewModel _vm;
+        private readonly AppOptions _appOptions;
+
+        public LoginApproveDevicePage(AppOptions appOptions = null)
+        {
+            InitializeComponent();
+            _vm = BindingContext as LoginApproveDeviceViewModel;
+            _vm.LogInWithMasterPasswordAction = () => StartLogInWithMasterPasswordAsync().FireAndForget();
+            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
+            _vm.RequestAdminApprovalAction = () => RequestAdminApprovalAsync().FireAndForget();
+            _vm.ContinueToVaultAction = () => ContinueToVaultAsync().FireAndForget();
+            _vm.Page = this;
+            _appOptions = appOptions;
+        }
+
+        protected override void OnAppearing()
+        {
+            _vm.InitAsync();
+        }
+
+        private async Task ContinueToVaultAsync()
+        {
+            if (AppHelpers.SetAlternateMainPage(_appOptions))
+            {
+                return;
+            }
+            var previousPage = await AppHelpers.ClearPreviousPage();
+            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
+        }
+
+        private async Task StartLogInWithMasterPasswordAsync()
+        {
+            var page = new LockPage(_appOptions, checkPendingAuthRequests: false);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task StartLoginWithDeviceAsync()
+        {
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions, true);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task RequestAdminApprovalAsync()
+        {
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AdminApproval, _appOptions, true);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+    }
+}
+
--- a/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
+++ b/src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Utilities.AccountManagement;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Domain;
+using Bit.Core.Models.Request;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class LoginApproveDeviceViewModel : BaseViewModel
+    {
+        private bool _rememberThisDevice;
+        private bool _approveWithMyOtherDeviceEnabled;
+        private bool _requestAdminApprovalEnabled;
+        private bool _approveWithMasterPasswordEnabled;
+        private string _email;
+        private readonly IStateService _stateService;
+        private readonly IApiService _apiService;
+        private IDeviceTrustCryptoService _deviceTrustCryptoService;
+        private readonly IAuthService _authService;
+        private readonly ISyncService _syncService;
+        private readonly IMessagingService _messagingService;
+
+        public ICommand ApproveWithMyOtherDeviceCommand { get; }
+        public ICommand RequestAdminApprovalCommand { get; }
+        public ICommand ApproveWithMasterPasswordCommand { get; }
+        public ICommand ContinueCommand { get; }
+        public ICommand LogoutCommand { get; }
+
+        public Action LogInWithMasterPasswordAction { get; set; }
+        public Action LogInWithDeviceAction { get; set; }
+        public Action RequestAdminApprovalAction { get; set; }
+        public Action ContinueToVaultAction { get; set; }
+
+        public LoginApproveDeviceViewModel()
+        {
+            _stateService = ServiceContainer.Resolve<IStateService>();
+            _apiService = ServiceContainer.Resolve<IApiService>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
+            _authService = ServiceContainer.Resolve<IAuthService>();
+            _syncService = ServiceContainer.Resolve<ISyncService>();
+            _messagingService = ServiceContainer.Resolve<IMessagingService>();
+
+            PageTitle = AppResources.LogInInitiated;
+            RememberThisDevice = true;
+
+            ApproveWithMyOtherDeviceCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithDeviceAction),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            RequestAdminApprovalCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(RequestAdminApprovalAction),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            ApproveWithMasterPasswordCommand = new AsyncCommand(() => SetDeviceTrustAndInvokeAsync(LogInWithMasterPasswordAction),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            ContinueCommand = new AsyncCommand(CreateNewSsoUserAsync,
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            LogoutCommand = new Command(() => _messagingService.Send(AccountsManagerMessageCommands.LOGOUT));
+        }
+
+        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
+
+        public bool RememberThisDevice
+        {
+            get => _rememberThisDevice;
+            set => SetProperty(ref _rememberThisDevice, value);
+        }
+
+        public bool ApproveWithMyOtherDeviceEnabled
+        {
+            get => _approveWithMyOtherDeviceEnabled;
+            set => SetProperty(ref _approveWithMyOtherDeviceEnabled, value);
+        }
+
+        public bool RequestAdminApprovalEnabled
+        {
+            get => _requestAdminApprovalEnabled;
+            set => SetProperty(ref _requestAdminApprovalEnabled, value,
+                additionalPropertyNames: new[] { nameof(IsNewUser) });
+        }
+
+        public bool ApproveWithMasterPasswordEnabled
+        {
+            get => _approveWithMasterPasswordEnabled;
+            set => SetProperty(ref _approveWithMasterPasswordEnabled, value,
+                additionalPropertyNames: new[] { nameof(IsNewUser) });
+        }
+
+        public bool IsNewUser => !RequestAdminApprovalEnabled && !ApproveWithMasterPasswordEnabled;
+
+        public string Email
+        {
+            get => _email;
+            set => SetProperty(ref _email, value, additionalPropertyNames:
+                new string[] {
+                    nameof(LoggingInAsText)
+                });
+        }
+
+        public async Task InitAsync()
+        {
+            try
+            {
+                Email = await _stateService.GetActiveUserEmailAsync();
+                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
+                RequestAdminApprovalEnabled = decryptOptions?.TrustedDeviceOption?.HasAdminApproval ?? false;
+                ApproveWithMasterPasswordEnabled = decryptOptions?.HasMasterPassword ?? false;
+                ApproveWithMyOtherDeviceEnabled = decryptOptions?.TrustedDeviceOption?.HasLoginApprovingDevice ?? false;
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+        }
+
+        public async Task CreateNewSsoUserAsync()
+        {
+            await _authService.CreateNewSsoUserAsync(await _stateService.GetRememberedOrgIdentifierAsync());
+            if (RememberThisDevice)
+            {
+                await _deviceTrustCryptoService.TrustDeviceAsync();
+            }
+
+            _syncService.FullSyncAsync(true).FireAndForget();
+            await Device.InvokeOnMainThreadAsync(ContinueToVaultAction);
+        }
+
+        private async Task SetDeviceTrustAndInvokeAsync(Action action)
+        {
+            await _deviceTrustCryptoService.SetShouldTrustDeviceAsync(RememberThisDevice);
+            await Device.InvokeOnMainThreadAsync(action);
+        }
+    }
+}
+
--- a/src/App/Pages/Accounts/LoginPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPage.xaml.cs
@@ -4,6 +4,7 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
+using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -135,7 +136,7 @@ namespace Bit.App.Pages

        private async Task StartLoginWithDeviceAsync()
        {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, _appOptions);
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -21,17 +21,17 @@
        <StackLayout
            Padding="7, 0, 7, 20">
            <Label
-                Text="{u:I18n LogInInitiated}"
+                Text="{Binding Title}"
                FontSize="Title"
                FontAttributes="Bold"
                Margin="0,14,0,21"
                AutomationId="LogInInitiatedLabel" />
            <Label
-                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
+                Text="{Binding SubTitle}"
                FontSize="Small"
                Margin="0,0,0,10"/>
            <Label
-                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
+                Text="{Binding Description}"
                FontSize="Small"
                Margin="0,0,0,24"/>
            <Label
@@ -40,41 +40,39 @@
                FontAttributes="Bold"/>
            <controls:MonoLabel
                FormattedText="{Binding FingerprintPhrase}"
-                FontSize="Medium"
+                FontSize="Small"
                TextColor="{DynamicResource FingerprintPhrase}"
                AutomationId="FingerprintPhraseValue" />
            <Label
                Text="{u:I18n ResendNotification}"
-                StyleClass="text-md"
+                IsVisible="{Binding ResendNotificationVisible}"
+                StyleClass="text-sm"
+                FontAttributes="Bold"
                HorizontalOptions="Start"
-                Margin="0,40,0,0"
+                Margin="0,24,0,0"
                TextColor="{DynamicResource HyperlinkColor}"
                AutomationId="ResendNotificationButton">
                <Label.GestureRecognizers>
                    <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
                </Label.GestureRecognizers>
            </Label>
-            <StackLayout
-                Orientation="Horizontal"
-                Margin="0,30,0,0">
-                <Label
-                    Text="{u:I18n NeedAnotherOption}"
-                    FontSize="Small"
-                    VerticalTextAlignment="End"/>
-                <Label
-                    Text="{u:I18n ViewAllLoginOptions}"
-                    StyleClass="text-md"
-                    VerticalTextAlignment="End"
-                    VerticalOptions="CenterAndExpand"
-                    Margin="5, 0"
-                    TextColor="{DynamicResource HyperlinkColor}"
-                    AutomationId="ViewAllLoginOptionsButton">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding CloseCommand}" />
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
-               
+            <BoxView
+                HeightRequest="1"
+                Margin="0,24,0,24"
+                Color="{DynamicResource DisabledIconColor}" />
+            <Label
+                Text="{Binding OtherOptions}"
+                FontSize="Small"/>
+            <Label
+                Text="{u:I18n ViewAllLoginOptions}"
+                StyleClass="text-sm"
+                FontAttributes="Bold"
+                TextColor="{DynamicResource HyperlinkColor}"
+                AutomationId="ViewAllLoginOptionsButton">
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding CloseCommand}" />
+                </Label.GestureRecognizers>
+            </Label>
        </StackLayout>
    </ScrollView>
 </pages:BaseContentPage>
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
+using Bit.Core.Enums;
 using Xamarin.Forms;

 namespace Bit.App.Pages
@@ -12,13 +13,15 @@ namespace Bit.App.Pages
        private LoginPasswordlessRequestViewModel _vm;
        private readonly AppOptions _appOptions;

-        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
+        public LoginPasswordlessRequestPage(string email, AuthRequestType authRequestType, AppOptions appOptions = null, bool authingWithSso = false)
        {
            InitializeComponent();
            _appOptions = appOptions;
            _vm = BindingContext as LoginPasswordlessRequestViewModel;
            _vm.Page = this;
            _vm.Email = email;
+            _vm.AuthRequestType = authRequestType;
+            _vm.AuthingWithSso = authingWithSso;
            _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
            _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
            _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,7 +12,9 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
+using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -32,6 +35,9 @@ namespace Bit.App.Pages
        private IPlatformUtilsService _platformUtilsService;
        private IEnvironmentService _environmentService;
        private ILogger _logger;
+        private IDeviceTrustCryptoService _deviceTrustCryptoService;
+        private readonly ICryptoFunctionService _cryptoFunctionService;
+        private readonly ICryptoService _cryptoService;

        protected override II18nService i18nService => _i18nService;
        protected override IEnvironmentService environmentService => _environmentService;
@@ -44,6 +50,7 @@ namespace Bit.App.Pages
        private string _email;
        private string _requestId;
        private string _requestAccessCode;
+        private AuthRequestType _authRequestType;
        // Item1 publicKey, Item2 privateKey
        private Tuple<byte[], byte[]> _requestKeyPair;

@@ -57,8 +64,9 @@ namespace Bit.App.Pages
            _i18nService = ServiceContainer.Resolve<II18nService>();
            _stateService = ServiceContainer.Resolve<IStateService>();
            _logger = ServiceContainer.Resolve<ILogger>();
-
-            PageTitle = AppResources.LogInWithAnotherDevice;
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
+            _cryptoFunctionService = ServiceContainer.Resolve<ICryptoFunctionService>();
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>();

            CreatePasswordlessLoginCommand = new AsyncCommand(CreatePasswordlessLoginAsync,
                onException: ex => HandleException(ex),
@@ -73,10 +81,91 @@ namespace Bit.App.Pages
        public Action LogInSuccessAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }
        public Action CloseAction { get; set; }
+        public bool AuthingWithSso { get; set; }

        public ICommand CreatePasswordlessLoginCommand { get; }
        public ICommand CloseCommand { get; }

+        public string HeaderTitle
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.LogInWithDevice;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.LogInInitiated;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string Title
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.LogInInitiated;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.AdminApprovalRequested;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string SubTitle
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.ANotificationHasBeenSentToYourDevice;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.YourRequestHasBeenSentToYourAdmin;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string Description
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.YouWillBeNotifiedOnceApproved;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string OtherOptions
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.TroubleLoggingIn;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
        public string FingerprintPhrase
        {
            get => _fingerprintPhrase;
@@ -89,6 +178,25 @@ namespace Bit.App.Pages
            set => SetProperty(ref _email, value);
        }

+        public AuthRequestType AuthRequestType
+        {
+            get => _authRequestType;
+            set
+            {
+                SetProperty(ref _authRequestType, value, additionalPropertyNames: new string[]
+                {
+                    nameof(Title),
+                    nameof(SubTitle),
+                    nameof(Description),
+                    nameof(OtherOptions),
+                    nameof(ResendNotificationVisible)
+                });
+                PageTitle = HeaderTitle;
+            }
+        }
+
+        public bool ResendNotificationVisible => AuthRequestType == AuthRequestType.AuthenticateAndUnlock;
+
        public void StartCheckLoginRequestStatus()
        {
            try
@@ -119,25 +227,39 @@ namespace Bit.App.Pages

        private async Task CheckLoginRequestStatus()
        {
-            if (string.IsNullOrEmpty(_requestId) || string.IsNullOrEmpty(_requestAccessCode))
+            if (string.IsNullOrEmpty(_requestId))
            {
                return;
            }

            try
            {
-                var response = await _authService.GetPasswordlessLoginResponseAsync(_requestId, _requestAccessCode);
+                PasswordlessLoginResponse response = null;
+                if (AuthingWithSso)
+                {
+                    response = await _authService.GetPasswordlessLoginRequestByIdAsync(_requestId);
+                }
+                else
+                {
+                    response = await _authService.GetPasswordlessLoginResquestAsync(_requestId, _requestAccessCode);
+                }

-                if (response.RequestApproved == null || !response.RequestApproved.Value)
+                if (response?.RequestApproved != true)
                {
                    return;
                }

                StopCheckLoginRequestStatus();

-                var authResult = await _authService.LogInPasswordlessAsync(Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
+                var authResult = await _authService.LogInPasswordlessAsync(AuthingWithSso, Email, _requestAccessCode, _requestId, _requestKeyPair.Item2, response.Key, response.MasterPasswordHash);
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();

+                if (authResult == null && await _stateService.IsAuthenticatedAsync())
+                {
+                    await HandleLoginCompleteAsync();
+                    return;
+                }
+
                if (await HandleCaptchaAsync(authResult.CaptchaSiteKey, authResult.CaptchaNeeded, CheckLoginRequestStatus))
                {
                    return;
@@ -153,10 +275,13 @@ namespace Bit.App.Pages
                }
                else
                {
-                    _syncService.FullSyncAsync(true).FireAndForget();
-                    LogInSuccessAction?.Invoke();
+                    await HandleLoginCompleteAsync();
                }
            }
+            catch (ApiException ex) when (ex.Error?.StatusCode == System.Net.HttpStatusCode.BadRequest)
+            {
+                HandleException(ex);
+            }
            catch (Exception ex)
            {
                StartCheckLoginRequestStatus();
@@ -164,30 +289,65 @@ namespace Bit.App.Pages
            }
        }

+        private async Task HandleLoginCompleteAsync()
+        {
+            await _stateService.SetPendingAdminAuthRequestAsync(null);
+            _syncService.FullSyncAsync(true).FireAndForget();
+            LogInSuccessAction?.Invoke();
+        }
+
        private async Task CreatePasswordlessLoginAsync()
        {
            await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));

-            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
-            if (response != null)
+            PasswordlessLoginResponse response = null;
+            var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
+            if (pendingRequest != null && _authRequestType == AuthRequestType.AdminApproval)
            {
-                FingerprintPhrase = response.FingerprintPhrase;
-                _requestId = response.Id;
-                _requestAccessCode = response.RequestAccessCode;
-                _requestKeyPair = response.RequestKeyPair;
+                response = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
+                if (response == null || (response.IsAnswered && !response.RequestApproved.Value))
+                {
+                    // handle pending auth request not valid remove it from state
+                    await _stateService.SetPendingAdminAuthRequestAsync(null);
+                    pendingRequest = null;
+                    response = null;
+                }
+                else
+                {
+                    // Derive pubKey from privKey in state to avoid MITM attacks
+                    // Also generate FingerprintPhrase locally for the same reason
+                    var derivedPublicKey = await _cryptoFunctionService.RsaExtractPublicKeyAsync(pendingRequest.PrivateKey);
+                    response.FingerprintPhrase = string.Join("-", await _cryptoService.GetFingerprintAsync(Email, derivedPublicKey));
+                    response.RequestKeyPair = new Tuple<byte[], byte[]>(derivedPublicKey, pendingRequest.PrivateKey);
+                }
            }

+            if (response == null)
+            {
+                response = await _authService.PasswordlessCreateLoginRequestAsync(_email, AuthRequestType);
+            }
+
+            await HandlePasswordlessLoginAsync(response, pendingRequest == null && _authRequestType == AuthRequestType.AdminApproval);
            await _deviceActionService.HideLoadingAsync();
        }

-        private void HandleException(Exception ex)
+        private async Task HandlePasswordlessLoginAsync(PasswordlessLoginResponse response, bool createPendingAdminRequest)
        {
-            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
+            if (response == null)
            {
-                await _deviceActionService.HideLoadingAsync();
-                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
-            }).FireAndForget();
-            _logger.Exception(ex);
+                throw new ArgumentNullException(nameof(response));
+            }
+
+            if (createPendingAdminRequest)
+            {
+                var pendingAuthRequest = new PendingAdminAuthRequest { Id = response.Id, PrivateKey = response.RequestKeyPair.Item2 };
+                await _stateService.SetPendingAdminAuthRequestAsync(pendingAuthRequest);
+            }
+
+            FingerprintPhrase = response.FingerprintPhrase;
+            _requestId = response.Id;
+            _requestAccessCode = response.RequestAccessCode;
+            _requestKeyPair = response.RequestKeyPair;
        }
    }
 }
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -29,6 +29,8 @@ namespace Bit.App.Pages
            _vm.SsoAuthSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SsoAuthSuccessAsync());
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
+            _vm.StartDeviceApprovalOptionsAction =
+                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () =>
            {
                await Navigation.PopModalAsync();
@@ -106,10 +108,17 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

+        private async Task StartDeviceApprovalOptionsAsync()
+        {
+            var page = new LoginApproveDevicePage();
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
        private async Task SsoAuthSuccessAsync()
        {
            RestoreAppOptionsFromCopy();
            await AppHelpers.ClearPreviousPage();
+
            if (await _vaultTimeoutService.IsLockedAsync())
            {
                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -9,6 +9,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Essentials;
@@ -29,8 +30,11 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly ILogger _logger;
        private readonly IOrganizationService _organizationService;
+        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
+        private readonly ICryptoService _cryptoService;

        private string _orgIdentifier;
+        private bool _useEphemeralWebBrowserSession;

        public LoginSsoPageViewModel()
        {
@@ -45,7 +49,8 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
            _organizationService = ServiceContainer.Resolve<IOrganizationService>();
-
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
+            _cryptoService = ServiceContainer.Resolve<ICryptoService>();

            PageTitle = AppResources.Bitwarden;
            LogInCommand = new AsyncCommand(LogInAsync, allowsMultipleExecutions: false);
@@ -61,6 +66,7 @@ namespace Bit.App.Pages
        public Action StartTwoFactorAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action SsoAuthSuccessAction { get; set; }
+        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }

@@ -109,7 +115,7 @@ namespace Bit.App.Pages

                await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);

-                var response = await _apiService.PreValidateSso(OrgIdentifier);
+                var response = await _apiService.PreValidateSsoAsync(OrgIdentifier);

                if (string.IsNullOrWhiteSpace(response?.Token))
                {
@@ -140,10 +146,12 @@ namespace Bit.App.Pages
                          "ssoToken=" + Uri.EscapeDataString(ssoToken);

                WebAuthenticatorResult authResult = null;
-
-                authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
-                    new Uri(REDIRECT_URI));
-
+                authResult = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions()
+                {
+                    CallbackUrl = new Uri(REDIRECT_URI),
+                    Url = new Uri(url),
+                    PrefersEphemeralWebBrowserSession = _useEphemeralWebBrowserSession,
+                });

                var code = GetResultCode(authResult, state);
                if (!string.IsNullOrEmpty(code))
@@ -168,6 +176,8 @@ namespace Bit.App.Pages
            {
                // user canceled
                await _deviceActionService.HideLoadingAsync();
+                // Workaroung for cached expired sso token PM-3551 
+                _useEphemeralWebBrowserSession = true;
            }
            catch (Exception ex)
            {
@@ -197,28 +207,93 @@ namespace Bit.App.Pages
            try
            {
                var response = await _authService.LogInSsoAsync(code, codeVerifier, REDIRECT_URI, orgId);
+                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                await _stateService.SetRememberedOrgIdentifierAsync(OrgIdentifier);
                await _deviceActionService.HideLoadingAsync();
                if (response.TwoFactor)
                {
                    StartTwoFactorAction?.Invoke();
+                    return;
                }
-                else if (response.ResetMasterPassword)
+
+                // Trusted device option is sent regardless if this is a trusted device or not
+                // If it is trusted, it will have the necessary keys
+                if (decryptOptions?.TrustedDeviceOption != null)
                {
+                    if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
+                    {
+                        // If we have a device key but no keys on server, we need to remove the device key
+                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
+                        {
+                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
+                            StartDeviceApprovalOptionsAction?.Invoke();
+                            return;
+                        }
+                        // If user doesn't have a MP, but has reset password permission, they must set a MP
+                        if (!decryptOptions.HasMasterPassword &&
+                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
+                        {
+                            StartSetPasswordAction?.Invoke();
+                            return;
+                        }
+                        // Update temp password only if the device is trusted and therefore has a decrypted User Key set
+                        if (response.ForcePasswordReset)
+                        {
+                            UpdateTempPasswordAction?.Invoke();
+                            return;
+                        }
+                        // Device is trusted and has keys, so we can decrypt
+                        _syncService.FullSyncAsync(true).FireAndForget();
+                        SsoAuthSuccessAction?.Invoke();
+                        return;
+                    }
+
+                    // Check for pending Admin Auth requests before navigating to device approval options
+                    var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
+                    if (pendingRequest != null)
+                    {
+                        var authRequest = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
+                        if (authRequest?.RequestApproved == true)
+                        {
+                            var authResult = await _authService.LogInPasswordlessAsync(true, await _stateService.GetActiveUserEmailAsync(), authRequest.RequestAccessCode, pendingRequest.Id, pendingRequest.PrivateKey, authRequest.Key, authRequest.MasterPasswordHash);
+                            if (authResult == null && await _stateService.IsAuthenticatedAsync())
+                            {
+                                await Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(
+                                 () => _platformUtilsService.ShowToast("info", null, AppResources.LoginApproved));
+                                await _stateService.SetPendingAdminAuthRequestAsync(null);
+                                _syncService.FullSyncAsync(true).FireAndForget();
+                                SsoAuthSuccessAction?.Invoke();
+                            }
+                        }
+                        else
+                        {
+                            await _stateService.SetPendingAdminAuthRequestAsync(null);
+                            StartDeviceApprovalOptionsAction?.Invoke();
+                        }
+                    }
+                    else
+                    {
+                        StartDeviceApprovalOptionsAction?.Invoke();
+                    }
+                    return;
+                }
+
+                // In the standard, non TDE case, a user must set password if they don't
+                // have one and they aren't using key connector.
+                // Note: TDE & Key connector are mutually exclusive org config options.
+                if (response.ResetMasterPassword || (decryptOptions?.RequireSetPassword == true))
+                {
+                    // TODO: We need to look into how to handle this when Org removes TDE
+                    // Will we have the User Key by now to set a new password?
                    StartSetPasswordAction?.Invoke();
+                    return;
                }
-                else if (response.ForcePasswordReset)
-                {
-                    UpdateTempPasswordAction?.Invoke();
-                }
-                else
-                {
-                    var task = Task.Run(async () => await _syncService.FullSyncAsync(true));
-                    SsoAuthSuccessAction?.Invoke();
-                }
+
+                _syncService.FullSyncAsync(true).FireAndForget();
+                SsoAuthSuccessAction?.Invoke();
            }
-            catch (Exception e)
+            catch (Exception)
            {
                await _deviceActionService.HideLoadingAsync();
                await _platformUtilsService.ShowDialogAsync(AppResources.LoginSsoError,
--- a/src/App/Pages/Accounts/RegisterPageViewModel.cs
+++ b/src/App/Pages/Accounts/RegisterPageViewModel.cs
@@ -177,25 +177,28 @@ namespace Bit.App.Pages
            Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
            Email = Email.Trim().ToLower();
            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdfConfig);
-            var encKey = await _cryptoService.MakeEncKeyAsync(key);
-            var hashedPassword = await _cryptoService.HashPasswordAsync(MasterPassword, key);
-            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
+            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, Email, kdfConfig);
+            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(
+                newMasterKey,
+                await _cryptoService.MakeUserKeyAsync()
+            );
+            var hashedPassword = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey);
+            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
            var request = new RegisterRequest
            {
                Email = Email,
                Name = Name,
                MasterPasswordHash = hashedPassword,
                MasterPasswordHint = Hint,
-                Key = encKey.Item2.EncryptedString,
+                Key = newProtectedUserKey.EncryptedString,
                Kdf = kdfConfig.Type,
                KdfIterations = kdfConfig.Iterations,
                KdfMemory = kdfConfig.Memory,
                KdfParallelism = kdfConfig.Parallelism,
                Keys = new KeysRequest
                {
-                    PublicKey = keys.Item1,
-                    EncryptedPrivateKey = keys.Item2.EncryptedString
+                    PublicKey = newPublicKey,
+                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
                },
                CaptchaResponse = _captchaToken,
            };
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs
@@ -30,14 +30,14 @@ namespace Bit.App.Pages

        public async Task Init()
        {
-            Organization = await _keyConnectorService.GetManagingOrganization();
+            Organization = await _keyConnectorService.GetManagingOrganizationAsync();
        }

        public async Task MigrateAccount()
        {
            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);

-            await _keyConnectorService.MigrateUser();
+            await _keyConnectorService.MigrateUserAsync();
            await _syncService.FullSyncAsync(true);

            await _deviceActionService.HideLoadingAsync();
@@ -47,7 +47,7 @@ namespace Bit.App.Pages
        {
            await _deviceActionService.ShowLoadingAsync(AppResources.Loading);

-            await _apiService.PostLeaveOrganization(Organization.Id);
+            await _apiService.PostLeaveOrganizationAsync(Organization.Id);
            await _syncService.FullSyncAsync(true);

            await _deviceActionService.HideLoadingAsync();
--- a/src/App/Pages/Accounts/SetPasswordPage.xaml
+++ b/src/App/Pages/Accounts/SetPasswordPage.xaml
@@ -51,7 +51,8 @@
                        <Label
                            Text="{u:I18n ResetPasswordAutoEnrollInviteWarning}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Start"
+                            AutomationId="ResetPasswordAutoEnrollInviteWarningLabel" />
                    </Frame>
                </Grid>
                <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -73,7 +74,8 @@
                        <Label
                            Text="{Binding PolicySummary}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Start"
+                            AutomationId="PolicyInEffectLabel" />
                    </Frame>
                </Grid>
                <Grid StyleClass="box-row">
@@ -98,7 +100,8 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        AutomationId="MasterPasswordField" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -108,7 +111,8 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        AutomationId="ToggleMasterPasswordVisibilityButton" />
                </Grid>
                <Label
                    Text="{u:I18n MasterPasswordDescription}"
@@ -137,7 +141,8 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        AutomationId="RetypePasswordField" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -147,7 +152,8 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        AutomationId="ToggleRetypePasswordVisibilityButton" />
                </Grid>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -158,7 +164,8 @@
                        Text="{Binding Hint}"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}" />
+                        ReturnCommand="{Binding SubmitCommand}"
+                        AutomationId="MasterPasswordHintLabel" />
                </StackLayout>
                <Label
                    Text="{u:I18n MasterPasswordHintDescription}"
--- a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
@@ -165,26 +165,18 @@ namespace Bit.App.Pages

            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
            var email = await _stateService.GetEmailAsync();
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
-            var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
+            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.ServerAuthorization);
+            var localMasterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey, HashPurpose.LocalAuthorization);

-            Tuple<SymmetricCryptoKey, EncString> encKey;
-            var existingEncKey = await _cryptoService.GetEncKeyAsync();
-            if (existingEncKey == null)
-            {
-                encKey = await _cryptoService.MakeEncKeyAsync(key);
-            }
-            else
-            {
-                encKey = await _cryptoService.RemakeEncKeyAsync(key);
-            }
+            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey,
+                await _cryptoService.GetUserKeyAsync() ?? await _cryptoService.MakeUserKeyAsync());

-            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
+            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
            var request = new SetPasswordRequest
            {
                MasterPasswordHash = masterPasswordHash,
-                Key = encKey.Item2.EncryptedString,
+                Key = newProtectedUserKey.EncryptedString,
                MasterPasswordHint = Hint,
                Kdf = kdfConfig.Type.GetValueOrDefault(KdfType.PBKDF2_SHA256),
                KdfIterations = kdfConfig.Iterations.GetValueOrDefault(Constants.Pbkdf2Iterations),
@@ -193,8 +185,8 @@ namespace Bit.App.Pages
                OrgIdentifier = OrgIdentifier,
                Keys = new KeysRequest
                {
-                    PublicKey = keys.Item1,
-                    EncryptedPrivateKey = keys.Item2.EncryptedString
+                    PublicKey = newPublicKey,
+                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
                }
            };

@@ -204,19 +196,20 @@ namespace Bit.App.Pages
                // Set Password and relevant information
                await _apiService.SetPasswordAsync(request);
                await _stateService.SetKdfConfigurationAsync(kdfConfig);
-                await _cryptoService.SetKeyAsync(key);
-                await _cryptoService.SetKeyHashAsync(localMasterPasswordHash);
-                await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString);
-                await _cryptoService.SetEncPrivateKeyAsync(keys.Item2.EncryptedString);
+                await _cryptoService.SetUserKeyAsync(newUserKey);
+                await _cryptoService.SetMasterKeyAsync(newMasterKey);
+                await _cryptoService.SetMasterKeyHashAsync(localMasterPasswordHash);
+                await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(newProtectedUserKey.EncryptedString);
+                await _cryptoService.SetUserPrivateKeyAsync(newProtectedPrivateKey.EncryptedString);

                if (ResetPasswordAutoEnroll)
                {
                    // Grab Organization Keys
                    var response = await _apiService.GetOrganizationKeysAsync(OrgId);
                    var publicKey = CoreHelpers.Base64UrlDecode(response.PublicKey);
-                    // Grab user's Encryption Key and encrypt with Org Public Key
-                    var userEncKey = await _cryptoService.GetEncKeyAsync();
-                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userEncKey.Key, publicKey);
+                    // Grab User Key and encrypt with Org Public Key
+                    var userKey = await _cryptoService.GetUserKeyAsync();
+                    var encryptedKey = await _cryptoService.RsaEncryptAsync(userKey.Key, publicKey);
                    // Request
                    var resetRequest = new OrganizationUserResetPasswordEnrollmentRequest
                    {
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -4,6 +4,7 @@ using Bit.App.Controls;
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.Forms;

@@ -17,26 +18,29 @@ namespace Bit.App.Pages

        private TwoFactorPageViewModel _vm;
        private bool _inited;
-        private bool _authingWithSso;
        private string _orgIdentifier;

        public TwoFactorPage(bool? authingWithSso = false, AppOptions appOptions = null, string orgIdentifier = null)
        {
            InitializeComponent();
            SetActivityIndicator();
-            _authingWithSso = authingWithSso ?? false;
            _appOptions = appOptions;
            _orgIdentifier = orgIdentifier;
            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vm = BindingContext as TwoFactorPageViewModel;
            _vm.Page = this;
+            _vm.AuthingWithSso = authingWithSso ?? false;
            _vm.StartSetPasswordAction = () =>
                Device.BeginInvokeOnMainThread(async () => await StartSetPasswordAsync());
            _vm.TwoFactorAuthSuccessAction = () =>
-                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessAsync());
+                Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessToMainAsync());
+            _vm.LockAction = () =>
+                Device.BeginInvokeOnMainThread(TwoFactorAuthSuccessWithSSOLocked);
            _vm.UpdateTempPasswordAction =
                () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
+            _vm.StartDeviceApprovalOptionsAction =
+                () => Device.BeginInvokeOnMainThread(async () => await StartDeviceApprovalOptionsAsync());
            _vm.CloseAction = async () => await Navigation.PopModalAsync();
            DuoWebView = _duoWebView;
            if (Device.RuntimePlatform == Device.Android)
@@ -180,21 +184,25 @@ namespace Bit.App.Pages
            await Navigation.PushModalAsync(new NavigationPage(page));
        }

-        private async Task TwoFactorAuthSuccessAsync()
+        private async Task StartDeviceApprovalOptionsAsync()
        {
-            if (_authingWithSso)
+            var page = new LoginApproveDevicePage();
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private void TwoFactorAuthSuccessWithSSOLocked()
+        {
+            Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
+        }
+
+        private async Task TwoFactorAuthSuccessToMainAsync()
+        {
+            if (AppHelpers.SetAlternateMainPage(_appOptions))
            {
-                Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
-            }
-            else
-            {
-                if (AppHelpers.SetAlternateMainPage(_appOptions))
-                {
-                    return;
-                }
-                var previousPage = await AppHelpers.ClearPreviousPage();
-                Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
+                return;
            }
+            var previousPage = await AppHelpers.ClearPreviousPage();
+            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
        }

        private void Token_TextChanged(object sender, TextChangedEventArgs e)
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -11,6 +11,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -32,12 +33,12 @@ namespace Bit.App.Pages
        private readonly IStateService _stateService;
        private readonly II18nService _i18nService;
        private readonly IAppIdService _appIdService;
+        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly ILogger _logger;
-
+        private readonly IDeviceTrustCryptoService _deviceTrustCryptoService;
        private TwoFactorProviderType? _selectedProviderType;
        private string _totpInstruction;
        private string _webVaultUrl = "https://vault.bitwarden.com";
-        private bool _authingWithSso = false;
        private bool _enableContinue = false;
        private bool _showContinue = true;

@@ -54,7 +55,9 @@ namespace Bit.App.Pages
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
            _logger = ServiceContainer.Resolve<ILogger>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();

            PageTitle = AppResources.TwoStepLogin;
            SubmitCommand = new Command(async () => await SubmitAsync());
@@ -69,6 +72,8 @@ namespace Bit.App.Pages

        public bool Remember { get; set; }

+        public bool AuthingWithSso { get; set; }
+
        public string Token { get; set; }

        public bool DuoMethod => SelectedProviderType == TwoFactorProviderType.Duo ||
@@ -118,6 +123,8 @@ namespace Bit.App.Pages
        public Command SubmitCommand { get; }
        public ICommand MoreCommand { get; }
        public Action TwoFactorAuthSuccessAction { get; set; }
+        public Action LockAction { get; set; }
+        public Action StartDeviceApprovalOptionsAction { get; set; }
        public Action StartSetPasswordAction { get; set; }
        public Action CloseAction { get; set; }
        public Action UpdateTempPasswordAction { get; set; }
@@ -136,8 +143,6 @@ namespace Bit.App.Pages
                return;
            }

-            _authingWithSso = _authService.AuthingWithSso();
-
            if (!string.IsNullOrWhiteSpace(_environmentService.BaseUrl))
            {
                _webVaultUrl = _environmentService.BaseUrl;
@@ -315,21 +320,84 @@ namespace Bit.App.Pages

                var task = Task.Run(() => _syncService.FullSyncAsync(true));
                await _deviceActionService.HideLoadingAsync();
+                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
                _messagingService.Send("listenYubiKeyOTP", false);
                _broadcasterService.Unsubscribe(nameof(TwoFactorPage));

-                if (_authingWithSso && result.ResetMasterPassword)
+                if (decryptOptions?.TrustedDeviceOption != null)
                {
+                    if (await _deviceTrustCryptoService.IsDeviceTrustedAsync())
+                    {
+                        // If we have a device key but no keys on server, we need to remove the device key
+                        if (decryptOptions.TrustedDeviceOption.EncryptedPrivateKey == null && decryptOptions.TrustedDeviceOption.EncryptedUserKey == null)
+                        {
+                            await _deviceTrustCryptoService.RemoveTrustedDeviceAsync();
+                            StartDeviceApprovalOptionsAction?.Invoke();
+                            return;
+                        }
+                        // If user doesn't have a MP, but has reset password permission, they must set a MP
+                        if (!decryptOptions.HasMasterPassword &&
+                            decryptOptions.TrustedDeviceOption.HasManageResetPasswordPermission)
+                        {
+                            StartSetPasswordAction?.Invoke();
+                            return;
+                        }
+                        // Update temp password only if the device is trusted and therefore has a decrypted User Key set
+                        if (result.ForcePasswordReset)
+                        {
+                            UpdateTempPasswordAction?.Invoke();
+                            return;
+                        }
+
+                        // Device is trusted and has keys, so we can decrypt
+                        _syncService.FullSyncAsync(true).FireAndForget();
+                        await TwoFactorAuthSuccessAsync();
+                        return;
+                    }
+
+                    // Check for pending Admin Auth requests before navigating to device approval options
+                    var pendingRequest = await _stateService.GetPendingAdminAuthRequestAsync();
+                    if (pendingRequest != null)
+                    {
+                        var authRequest = await _authService.GetPasswordlessLoginRequestByIdAsync(pendingRequest.Id);
+                        if (authRequest?.RequestApproved == true)
+                        {
+                            var authResult = await _authService.LogInPasswordlessAsync(true, await _stateService.GetActiveUserEmailAsync(), authRequest.RequestAccessCode, pendingRequest.Id, pendingRequest.PrivateKey, authRequest.Key, authRequest.MasterPasswordHash);
+                            if (authResult == null && await _stateService.IsAuthenticatedAsync())
+                            {
+                                await Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(
+                                 () => _platformUtilsService.ShowToast("info", null, AppResources.LoginApproved));
+                                await _stateService.SetPendingAdminAuthRequestAsync(null);
+                                _syncService.FullSyncAsync(true).FireAndForget();
+                                await TwoFactorAuthSuccessAsync();
+                            }
+                        }
+                        else
+                        {
+                            await _stateService.SetPendingAdminAuthRequestAsync(null);
+                            StartDeviceApprovalOptionsAction?.Invoke();
+                        }
+                    }
+                    else
+                    {
+                        StartDeviceApprovalOptionsAction?.Invoke();
+                    }
+                    return;
+                }
+
+                // In the standard, non TDE case, a user must set password if they don't
+                // have one and they aren't using key connector.
+                // Note: TDE & Key connector are mutually exclusive org config options.
+                if (result.ResetMasterPassword || (decryptOptions?.RequireSetPassword ?? false))
+                {
+                    // TODO: We need to look into how to handle this when Org removes TDE
+                    // Will we have the User Key by now to set a new password?
                    StartSetPasswordAction?.Invoke();
+                    return;
                }
-                else if (result.ForcePasswordReset)
-                {
-                    UpdateTempPasswordAction?.Invoke();
-                }
-                else
-                {
-                    TwoFactorAuthSuccessAction?.Invoke();
-                }
+
+                _syncService.FullSyncAsync(true).FireAndForget();
+                await TwoFactorAuthSuccessAsync();
            }
            catch (ApiException e)
            {
@@ -398,7 +466,8 @@ namespace Bit.App.Pages
                {
                    Email = _authService.Email,
                    MasterPasswordHash = _authService.MasterPasswordHash,
-                    DeviceIdentifier = await _appIdService.GetAppIdAsync()
+                    DeviceIdentifier = await _appIdService.GetAppIdAsync(),
+                    SsoEmail2FaSessionToken = _authService.SsoEmail2FaSessionToken
                };
                await _apiService.PostTwoFactorEmailAsync(request);
                if (showLoading)
@@ -422,5 +491,17 @@ namespace Bit.App.Pages
                return false;
            }
        }
+
+        public async Task TwoFactorAuthSuccessAsync()
+        {
+            if (AuthingWithSso && await _vaultTimeoutService.IsLockedAsync())
+            {
+                LockAction?.Invoke();
+            }
+            else
+            {
+                TwoFactorAuthSuccessAction?.Invoke();
+            }
+        }
    }
 }
--- a/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -48,7 +48,8 @@
                        <Label
                            Text="{Binding UpdateMasterPasswordWarningText }"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center" />
+                            HorizontalTextAlignment="Center"
+                            AutomationId="UpdatePasswordWarningLabel" />
                    </Frame>
                </Grid>
                <Grid IsVisible="{Binding IsPolicyInEffect}"
@@ -71,7 +72,8 @@
                        <Label
                            Text="{Binding PolicySummary}"
                            StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Start" />
+                            HorizontalTextAlignment="Start"
+                            AutomationId="PolicySummaryLabel" />
                    </Frame>
                </Grid>
                <Grid StyleClass="box-row" IsVisible="{Binding RequireCurrentPassword }">
@@ -96,7 +98,8 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        AutomationId="MasterPasswordField" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -106,7 +109,8 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        AutomationId="ToggleMasterPasswordVisibilityButton" />
                </Grid>
                <Grid StyleClass="box-row">
                    <Grid.RowDefinitions>
@@ -130,7 +134,8 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        AutomationId="NewPasswordField" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -140,7 +145,8 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        AutomationId="NewPasswordVisibilityButton" />
                </Grid>
            </StackLayout>
            <StackLayout StyleClass="box">
@@ -166,7 +172,8 @@
                        IsTextPredictionEnabled="False"
                        IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                        Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        AutomationId="RetypePasswordField" />
                    <controls:IconButton
                        StyleClass="box-row-button, box-row-button-platform"
                        Text="{Binding ShowPasswordIcon}"
@@ -176,7 +183,8 @@
                        Grid.RowSpan="2"
                        AutomationProperties.IsInAccessibleTree="True"
                        AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        AutomationId="ToggleRetypePasswordVisibilityButton" />
                </Grid>
                <StackLayout StyleClass="box-row">
                    <Label
@@ -187,7 +195,8 @@
                        Text="{Binding Hint}"
                        StyleClass="box-value"
                        ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}" />
+                        ReturnCommand="{Binding SubmitCommand}"
+                        AutomationId="MasterPasswordHintLabel" />
                </StackLayout>
                <Label
                    Text="{u:I18n MasterPasswordHintDescription}"
--- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs
@@ -93,12 +93,12 @@ namespace Bit.App.Pages
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
            var email = await _stateService.GetEmailAsync();

-            // Create new key and hash new password
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdfConfig);
-            var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key);
+            // Create new master key and hash new password
+            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, email, kdfConfig);
+            var masterPasswordHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey);

-            // Create new encKey for the User
-            var newEncKey = await _cryptoService.RemakeEncKeyAsync(key);
+            // Encrypt user key with new master key
+            var (userKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(masterKey);

            // Initiate API action
            try
@@ -108,10 +108,10 @@ namespace Bit.App.Pages
                switch (_reason)
                {
                    case ForcePasswordResetReason.AdminForcePasswordReset:
-                        await UpdateTempPasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
+                        await UpdateTempPasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
                        break;
                    case ForcePasswordResetReason.WeakMasterPasswordOnLogin:
-                        await UpdatePasswordAsync(masterPasswordHash, newEncKey.Item2.EncryptedString);
+                        await UpdatePasswordAsync(masterPasswordHash, newProtectedUserKey.EncryptedString);
                        break;
                    default:
                        throw new ArgumentOutOfRangeException();
@@ -155,7 +155,7 @@ namespace Bit.App.Pages

        private async Task UpdatePasswordAsync(string newMasterPasswordHash, string newEncKey)
        {
-            var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null);
+            var currentPasswordHash = await _cryptoService.HashMasterKeyAsync(CurrentMasterPassword, null);

            var request = new PasswordRequest
            {
--- a/src/App/Pages/BaseContentPage.cs
+++ b/src/App/Pages/BaseContentPage.cs
@@ -150,6 +150,12 @@ namespace Bit.App.Pages
        private async Task SaveActivityAsync()
        {
            SetServices();
+            if (await _stateService.GetActiveUserIdAsync() == null)
+            {
+                // Fresh install and/or all users logged out won't have an active user, skip saving last active time
+                return;
+            }
+
            await _stateService.SetLastActiveTimeAsync(_deviceActionService.GetActiveTime());
        }
    }
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -275,7 +275,7 @@
                            Margin="0,10,0,0"/>
                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                            x:Name="_anonAddyDomainNameEntry"
-                            Text="{Binding AnonAddyDomainName}"
+                            Text="{Binding AddyIoDomainName}"
                            StyleClass="box-value"
                            AutomationId="AnonAddyDomainNameEntry" />
                    </StackLayout>                    
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -545,7 +545,7 @@ namespace Bit.App.Pages
            set => SetProperty(ref _showForwardedEmailApiSecret, value);
        }

-        public string AnonAddyDomainName
+        public string AddyIoDomainName
        {
            get => _usernameOptions.AnonAddyDomainName;
            set
@@ -553,7 +553,7 @@ namespace Bit.App.Pages
                if (_usernameOptions.AnonAddyDomainName != value)
                {
                    _usernameOptions.AnonAddyDomainName = value;
-                    TriggerPropertyChanged(nameof(AnonAddyDomainName));
+                    TriggerPropertyChanged(nameof(AddyIoDomainName));
                    SaveUsernameOptionsAsync(false).FireAndForget();
                }
            }
@@ -793,7 +793,7 @@ namespace Bit.App.Pages
            TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
            TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
            TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
-            TriggerPropertyChanged(nameof(AnonAddyDomainName));
+            TriggerPropertyChanged(nameof(AddyIoDomainName));
            TriggerPropertyChanged(nameof(CatchAllEmailDomain));
            TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
            TriggerPropertyChanged(nameof(UsernameTypeSelected));
--- a/src/App/Pages/Send/SendAddEditPage.xaml
+++ b/src/App/Pages/Send/SendAddEditPage.xaml
@@ -175,7 +175,7 @@
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
+                                    HorizontalTextAlignment="Start"
                                    AutomationId="SendNoFileChosenLabel" />
                                <Label
                                    IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
@@ -183,7 +183,7 @@
                                    LineBreakMode="CharacterWrap"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
+                                    HorizontalTextAlignment="Start"
                                    AutomationId="SendCurrentFileNameLabel" />
                                <Button
                                    Text="{u:I18n ChooseFile}"
@@ -197,7 +197,7 @@
                                    Text="{u:I18n MaxFileSize}"
                                    StyleClass="text-sm, text-muted"
                                    HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center" />
+                                    HorizontalTextAlignment="Start" />
                            </StackLayout>
                            <Label
                                Text="{u:I18n TypeFileInfo}"
@@ -250,20 +250,6 @@
                                    AutomationId="SendHideTextByDefaultToggle" />
                            </StackLayout>
                        </StackLayout>
-                        <StackLayout
-                            StyleClass="box-row, box-row-switch">
-                            <Label
-                                Text="{Binding ShareOnSaveText}"
-                                StyleClass="box-label-regular"
-                                VerticalOptions="Center"
-                                HorizontalOptions="StartAndExpand" />
-                            <Switch
-                                IsToggled="{Binding ShareOnSave}"
-                                IsEnabled="{Binding SendEnabled}"
-                                HorizontalOptions="End"
-                                Margin="10,0,0,0"
-                                AutomationId="SendShareSendAfterSaveToggle" />
-                        </StackLayout>
                        <StackLayout
                            Orientation="Horizontal"
                            Spacing="0"
--- a/src/App/Pages/Send/SendAddEditPageViewModel.cs
+++ b/src/App/Pages/Send/SendAddEditPageViewModel.cs
@@ -127,10 +127,9 @@ namespace Bit.App.Pages
        public SendType? Type { get; set; }
        public byte[] FileData { get; set; }
        public string NewPassword { get; set; }
-        public bool ShareOnSave { get; set; }
        public bool DisableHideEmailControl { get; set; }
        public bool IsAddFromShare { get; set; }
-        public string ShareOnSaveText => CopyInsteadOfShareAfterSaving ? AppResources.CopySendLinkOnSave : AppResources.ShareOnSave;
+        public bool CopyInsteadOfShareAfterSaving { get; set; }
        public string OptionsAccessilibityText => ShowOptions ? AppResources.OptionsExpanded : AppResources.OptionsCollapsed;
        public List<KeyValuePair<string, SendType>> TypeOptions { get; }
        public List<KeyValuePair<string, string>> DeletionTypeOptions { get; }
@@ -184,15 +183,6 @@ namespace Bit.App.Pages
                }
            }
        }
-        public bool CopyInsteadOfShareAfterSaving
-        {
-            get => _copyInsteadOfShareAfterSaving;
-            set
-            {
-                SetProperty(ref _copyInsteadOfShareAfterSaving, value);
-                TriggerPropertyChanged(nameof(ShareOnSaveText));
-            }
-        }
        public SendView Send
        {
            get => _send;
@@ -412,34 +402,25 @@ namespace Bit.App.Pages
                    _messagingService.Send("sendUpdated");
                }

-                if (!ShareOnSave)
-                {
-                    _platformUtilsService.ShowToast("success", null,
-                    EditMode ? AppResources.SendUpdated : AppResources.NewSendCreated);
-                }
-
                if (!CopyInsteadOfShareAfterSaving)
                {
                    await CloseAsync();
                }

-                if (ShareOnSave)
+                var savedSend = await _sendService.GetAsync(sendId);
+                if (savedSend != null)
                {
-                    var savedSend = await _sendService.GetAsync(sendId);
-                    if (savedSend != null)
+                    var savedSendView = await savedSend.DecryptAsync();
+                    if (CopyInsteadOfShareAfterSaving)
                    {
-                        var savedSendView = await savedSend.DecryptAsync();
-                        if (CopyInsteadOfShareAfterSaving)
-                        {
-                            await AppHelpers.CopySendUrlAsync(savedSendView);
+                        await AppHelpers.CopySendUrlAsync(savedSendView);

-                            // wait so that the user sees the message before the view gets dismissed
-                            await Task.Delay(1300);
-                        }
-                        else
-                        {
-                            await AppHelpers.ShareSendUrlAsync(savedSendView);
-                        }
+                        // wait so that the user sees the message before the view gets dismissed
+                        await Task.Delay(1300);
+                    }
+                    else
+                    {
+                        await AppHelpers.ShareSendUrlAsync(savedSendView);
                    }
                }

--- a/src/App/Pages/Send/SendAddOnlyPage.xaml
+++ b/src/App/Pages/Send/SendAddOnlyPage.xaml
@@ -94,13 +94,13 @@
                            LineBreakMode="CharacterWrap"
                            StyleClass="text-sm, text-muted"
                            HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Center" />
+                            HorizontalTextAlignment="Start" />
                        <Label
                            Margin="0, 5, 0, 0"
                            Text="{u:I18n MaxFileSize}"
                            StyleClass="text-sm, text-muted"
                            HorizontalOptions="FillAndExpand"
-                            HorizontalTextAlignment="Center" />
+                            HorizontalTextAlignment="Start" />
                    </StackLayout>
                </StackLayout>
                <StackLayout
@@ -145,19 +145,6 @@
                            Margin="10,0,0,0" />
                    </StackLayout>
                </StackLayout>
-                <StackLayout
-                    StyleClass="box-row, box-row-switch">
-                    <Label
-                        Text="{Binding ShareOnSaveText}"
-                        StyleClass="box-label-regular"
-                        VerticalOptions="Center"
-                        HorizontalOptions="StartAndExpand" />
-                    <Switch
-                        IsToggled="{Binding ShareOnSave}"
-                        IsEnabled="{Binding SendEnabled}"
-                        HorizontalOptions="End"
-                        Margin="10,0,0,0" />
-                </StackLayout>
                <StackLayout
                    Orientation="Horizontal"
                    Spacing="0"
--- a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
+++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml
@@ -7,6 +7,7 @@
    xmlns:u="clr-namespace:Bit.App.Utilities"
    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
    x:DataType="pages:BlockAutofillUrisPageViewModel"
+    NavigationPage.HasBackButton="False"
    Title="{u:I18n BlockAutoFill}">
    <ContentPage.BindingContext>
        <pages:BlockAutofillUrisPageViewModel />
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -21,7 +21,6 @@ namespace Bit.App.Pages
        private readonly II18nService _i18nService;
        private readonly IExportService _exportService;
        private readonly IPolicyService _policyService;
-        private readonly IKeyConnectorService _keyConnectorService;
        private readonly IUserVerificationService _userVerificationService;
        private readonly IApiService _apiService;
        private readonly ILogger _logger;
@@ -45,8 +44,7 @@ namespace Bit.App.Pages
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
-            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>("userVerificationService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
            _apiService = ServiceContainer.Resolve<IApiService>("apiService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");

@@ -67,7 +65,7 @@ namespace Bit.App.Pages
            _initialized = true;
            FileFormatSelectedIndex = FileFormatOptions.FindIndex(k => k.Key == "json");
            DisablePrivateVaultPolicyEnabled = await _policyService.PolicyAppliesToUser(PolicyType.DisablePersonalVaultExport);
-            UseOTPVerification = await _keyConnectorService.GetUsesKeyConnector();
+            UseOTPVerification = !await _userVerificationService.HasMasterPasswordAsync(true);

            if (UseOTPVerification)
            {
@@ -165,9 +163,9 @@ namespace Bit.App.Pages
                return;
            }

-            var verificationType = await _keyConnectorService.GetUsesKeyConnector()
-                ? VerificationType.OTP
-                : VerificationType.MasterPassword;
+            var verificationType = await _userVerificationService.HasMasterPasswordAsync(true)
+                ? VerificationType.MasterPassword
+                : VerificationType.OTP;
            if (!await _userVerificationService.VerifyUser(Secret, verificationType))
            {
                return;
--- a/src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
+++ b/src/App/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
@@ -32,7 +32,8 @@
                        Padding="10, 0"
                        RowSpacing="0"
                        RowDefinitions="*, Auto, *, 10"
-                        ColumnDefinitions="*, *">
+                        ColumnDefinitions="*, *"
+                        AutomationId="LoginRequestCell">
                        <Label
                            Text="{u:I18n FingerprintPhrase}"
                            FontSize="Small"
@@ -45,20 +46,23 @@
                            FontSize="Small"
                            Padding="0, 5, 0, 10"
                            VerticalTextAlignment="Center"
-                            TextColor="{DynamicResource FingerprintPhrase}"/>
+                            TextColor="{DynamicResource FingerprintPhrase}"
+                            AutomationId="FingerprintPhraseLabel" />
                        <Label
                            Grid.Row="2"
                            HorizontalOptions="Start"
                            HorizontalTextAlignment="Start"
                            Text="{Binding RequestDeviceType}"
-                            StyleClass="list-header-sub" />
+                            StyleClass="list-header-sub"
+                            AutomationId="RequestDeviceLabel" />
                        <Label
                            Grid.Row="2"
                            Grid.Column="1"
                            HorizontalOptions="End"
                            HorizontalTextAlignment="End"
                            Text="{Binding CreationDate, Converter={StaticResource dateTime}}"
-                            StyleClass="list-header-sub" />
+                            StyleClass="list-header-sub"
+                            AutomationId="RequestDateLabel" />
                        <BoxView
                            StyleClass="list-section-separator-top, list-section-separator-top-platform"
                            VerticalOptions="End"
@@ -94,7 +98,8 @@
                        Margin="10,0"
                        Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
                        Label="{u:I18n DeclineAllRequests}"
-                        ButtonCommand="{Binding DeclineAllRequestsCommand}"/>
+                        ButtonCommand="{Binding DeclineAllRequestsCommand}"
+                        AutomationId="DeleteAllRequestsButton" />
            </StackLayout>
        </ResourceDictionary>
    </ContentPage.Resources>
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
@@ -49,6 +49,38 @@
                           AutomationId="{Binding AutomationIdSettingStatus}" />
                </controls:ExtendedStackLayout>
            </DataTemplate>
+            <DataTemplate
+                x:Key="regularWithDescriptionTemplate"
+                x:DataType="pages:SettingsPageListItem">
+                <controls:ExtendedStackLayout Orientation="Horizontal"
+                             StyleClass="list-row, list-row-platform">
+                    <StackLayout
+                         HorizontalOptions="StartAndExpand"
+                         VerticalOptions="Center">
+                         <controls:CustomLabel 
+                           Text="{Binding Name, Mode=OneWay}"
+                           LineBreakMode="{Binding LineBreakMode}"
+                           StyleClass="list-title"
+                           TextColor="{Binding NameColor}"
+                           AutomationId="{Binding AutomationIdSettingName}" />
+                        <controls:CustomLabel 
+                           Text="{Binding Description, Mode=OneWay}"
+                           LineBreakMode="{Binding LineBreakMode}"
+                           TextColor="{DynamicResource MutedColor}"
+                           FontSize="Micro"
+                           StyleClass="list-sub"/>
+                    </StackLayout>
+                    <controls:CustomLabel  Text="{Binding SubLabel, Mode=OneWay}"
+                           IsVisible="{Binding ShowSubLabel}"
+                           HorizontalOptions="End"
+                           HorizontalTextAlignment="End"
+                           VerticalOptions="CenterAndExpand"
+                           VerticalTextAlignment="Start"
+                           TextColor="{Binding SubLabelColor}"
+                           StyleClass="list-sub"
+                           AutomationId="{Binding AutomationIdSettingStatus}" />
+                </controls:ExtendedStackLayout>
+            </DataTemplate>
            <DataTemplate
                x:Key="timePickerTemplate"
                x:DataType="pages:SettingsPageListItem">
@@ -107,6 +139,7 @@
                x:Key="listItemDataTemplateSelector"
                HeaderTemplate="{StaticResource headerTemplate}"
                RegularTemplate="{StaticResource regularTemplate}"
+                RegularWithDescriptionTemplate="{StaticResource regularWithDescriptionTemplate}"
                TimePickerTemplate="{StaticResource timePickerTemplate}" />
        </ResourceDictionary>
    </ContentPage.Resources>
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
@@ -64,7 +64,7 @@ namespace Bit.App.Pages
        private void RowSelected(object sender, SelectionChangedEventArgs e)
        {
            ((ExtendedCollectionView)sender).SelectedItem = null;
-            if (e.CurrentSelection?.FirstOrDefault() is SettingsPageListItem item)
+            if (e.CurrentSelection?.FirstOrDefault() is SettingsPageListItem item && item.Enabled)
            {
                _vm?.ExecuteSettingItemCommand.Execute(item);
            }
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
@@ -13,8 +13,10 @@ namespace Bit.App.Pages
        public string Icon { get; set; }
        public string Name { get; set; }
        public string SubLabel { get; set; }
+        public string Description { get; set; }
        public TimeSpan? Time { get; set; }
        public bool UseFrame { get; set; }
+        public bool Enabled { get; set; } = true;
        public Func<Task> ExecuteAsync { get; set; }

        public bool SubLabelTextEnabled => SubLabel == AppResources.On;
@@ -24,6 +26,9 @@ namespace Bit.App.Pages
        public Color SubLabelColor => SubLabelTextEnabled ?
            ThemeManager.GetResourceColor("SuccessColor") :
            ThemeManager.GetResourceColor("MutedColor");
+        public Color NameColor => Enabled ?
+            ThemeManager.GetResourceColor("TextColor") :
+            ThemeManager.GetResourceColor("MutedColor");

        public string AutomationIdSettingName
        {
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageListItemSelector.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageListItemSelector.cs
@@ -7,6 +7,7 @@ namespace Bit.App.Pages
        public DataTemplate HeaderTemplate { get; set; }
        public DataTemplate RegularTemplate { get; set; }
        public DataTemplate TimePickerTemplate { get; set; }
+        public DataTemplate RegularWithDescriptionTemplate { get; set; }

        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
        {
@@ -16,6 +17,10 @@ namespace Bit.App.Pages
            }
            if (item is SettingsPageListItem listItem)
            {
+                if (!string.IsNullOrEmpty(listItem.Description))
+                {
+                    return RegularWithDescriptionTemplate;
+                }
                return listItem.ShowTimeInput ? TimePickerTemplate : RegularTemplate;
            }
            return null;
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -29,7 +29,7 @@ namespace Bit.App.Pages
        private readonly IBiometricService _biometricService;
        private readonly IPolicyService _policyService;
        private readonly ILocalizeService _localizeService;
-        private readonly IKeyConnectorService _keyConnectorService;
+        private readonly IUserVerificationService _userVerificationService;
        private readonly IClipboardService _clipboardService;
        private readonly ILogger _loggerService;
        private readonly IPushNotificationService _pushNotificationService;
@@ -48,6 +48,7 @@ namespace Bit.App.Pages
        private bool _reportLoggingEnabled;
        private bool _approvePasswordlessLoginRequests;
        private bool _shouldConnectToWatch;
+        private bool _hasMasterPassword;
        private readonly static List<KeyValuePair<string, int?>> VaultTimeoutOptions =
            new List<KeyValuePair<string, int?>>
            {
@@ -88,7 +89,7 @@ namespace Bit.App.Pages
            _biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _localizeService = ServiceContainer.Resolve<ILocalizeService>("localizeService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();
            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
            _loggerService = ServiceContainer.Resolve<ILogger>("logger");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();
@@ -100,12 +101,17 @@ namespace Bit.App.Pages
            ExecuteSettingItemCommand = new AsyncCommand<SettingsPageListItem>(item => item.ExecuteAsync(), onException: _loggerService.Exception, allowsMultipleExecutions: false);
        }

+        private bool IsVaultTimeoutActionLockAllowed => _hasMasterPassword || _biometric || _pin;
+
        public ObservableRangeCollection<ISettingsPageListItem> GroupedItems { get; set; }

        public IAsyncCommand<SettingsPageListItem> ExecuteSettingItemCommand { get; }

        public async Task InitAsync()
        {
+            var decryptionOptions = await _stateService.GetAccountDecryptionOptions();
+            // set has true for backwards compatibility
+            _hasMasterPassword = decryptionOptions?.HasMasterPassword ?? true;
            _supportsBiometric = await _platformUtilsService.SupportsBiometricAsync();
            var lastSync = await _syncService.GetLastSyncAsync();
            if (lastSync != null)
@@ -124,8 +130,17 @@ namespace Bit.App.Pages
            _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;
+
+            var pinSet = await _vaultTimeoutService.GetPinLockTypeAsync();
+            _pin = pinSet != PinLockType.Disabled;
+            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
+            var timeoutAction = await _vaultTimeoutService.GetVaultTimeoutAction() ?? VaultTimeoutAction.Lock;
+            if (!IsVaultTimeoutActionLockAllowed && timeoutAction == VaultTimeoutAction.Lock)
+            {
+                timeoutAction = VaultTimeoutAction.Logout;
+                await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
+            }
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.FirstOrDefault(o => o.Value == timeoutAction).Key;

            if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout))
            {
@@ -137,10 +152,6 @@ namespace Bit.App.Pages
                    (t.Value > 0 || t.Value == CustomVaultTimeoutValue) &&
                    t.Value != null).ToList();
            }
-
-            var pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
-            _pin = pinSet.Item1 || pinSet.Item2;
-            _biometric = await _vaultTimeoutService.IsBiometricLockSetAsync();
            _screenCaptureAllowed = await _stateService.GetScreenCaptureAllowedAsync();

            if (_vaultTimeoutDisplayValue == null)
@@ -148,8 +159,7 @@ namespace Bit.App.Pages
                _vaultTimeoutDisplayValue = AppResources.Custom;
            }

-            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() &&
-                !await _keyConnectorService.GetUsesKeyConnector();
+            _showChangeMasterPassword = IncludeLinksWithSubscriptionInfo() && await _userVerificationService.HasMasterPasswordAsync();
            _reportLoggingEnabled = await _loggerService.IsEnabled();
            _approvePasswordlessLoginRequests = await _stateService.GetApprovePasswordlessLoginsAsync();
            _shouldConnectToWatch = await _stateService.GetShouldConnectToWatchAsync();
@@ -323,6 +333,7 @@ namespace Bit.App.Pages
            }
            if (oldTimeout != newTimeout)
            {
+                await _cryptoService.RefreshKeysAsync();
                await Device.InvokeOnMainThreadAsync(BuildList);
            }
        }
@@ -387,8 +398,11 @@ namespace Bit.App.Pages
                // do nothing if we have a policy set
                return;
            }
-            var options = _vaultTimeoutActionOptions.Select(o =>
-                o.Key == _vaultTimeoutActionDisplayValue ? $"✓ {o.Key}" : o.Key).ToArray();
+
+            var options = IsVaultTimeoutActionLockAllowed
+                ? _vaultTimeoutActionOptions.Select(o => CreateSelectableOption(o.Key, _vaultTimeoutActionDisplayValue == o.Key)).ToArray()
+                : _vaultTimeoutActionOptions.Where(o => o.Value == VaultTimeoutAction.Logout).Select(v => ToSelectedOption(v.Key)).ToArray();
+
            var selection = await Page.DisplayActionSheet(AppResources.VaultTimeoutAction,
                AppResources.Cancel, null, options);
            if (selection == null || selection == AppResources.Cancel)
@@ -428,7 +442,7 @@ namespace Bit.App.Pages
                if (!string.IsNullOrWhiteSpace(pin))
                {
                    var masterPassOnRestart = false;
-                    if (!await _keyConnectorService.GetUsesKeyConnector())
+                    if (await _userVerificationService.HasMasterPasswordAsync())
                    {
                        masterPassOnRestart = await _platformUtilsService.ShowDialogAsync(
                            AppResources.PINRequireMasterPasswordRestart, AppResources.UnlockWithPIN,
@@ -437,19 +451,20 @@ namespace Bit.App.Pages

                    var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
                    var email = await _stateService.GetEmailAsync();
-                    var pinKey = await _cryptoService.MakePinKeyAysnc(pin, email, kdfConfig);
-                    var key = await _cryptoService.GetKeyAsync();
-                    var pinProtectedKey = await _cryptoService.EncryptAsync(key.Key, pinKey);
+                    var pinKey = await _cryptoService.MakePinKeyAsync(pin, email, kdfConfig);
+                    var userKey = await _cryptoService.GetUserKeyAsync();
+                    var protectedPinKey = await _cryptoService.EncryptAsync(userKey.Key, pinKey);
+
+                    var encPin = await _cryptoService.EncryptAsync(pin);
+                    await _stateService.SetProtectedPinAsync(encPin.EncryptedString);

                    if (masterPassOnRestart)
                    {
-                        var encPin = await _cryptoService.EncryptAsync(pin);
-                        await _stateService.SetProtectedPinAsync(encPin.EncryptedString);
-                        await _stateService.SetPinProtectedKeyAsync(pinProtectedKey);
+                        await _stateService.SetPinKeyEncryptedUserKeyEphemeralAsync(protectedPinKey);
                    }
                    else
                    {
-                        await _stateService.SetPinProtectedAsync(pinProtectedKey.EncryptedString);
+                        await _stateService.SetPinKeyEncryptedUserKeyAsync(protectedPinKey);
                    }
                }
                else
@@ -459,8 +474,8 @@ namespace Bit.App.Pages
            }
            if (!_pin)
            {
-                await _cryptoService.ClearPinProtectedKeyAsync();
                await _vaultTimeoutService.ClearAsync();
+                await UpdateVaultTimeoutActionIfNeededAsync();
            }
            BuildList();
        }
@@ -489,9 +504,10 @@ namespace Bit.App.Pages
            else
            {
                await _stateService.SetBiometricUnlockAsync(null);
+                await UpdateVaultTimeoutActionIfNeededAsync();
            }
            await _stateService.SetBiometricLockedAsync(false);
-            await _cryptoService.ToggleKeyAsync();
+            await _cryptoService.RefreshKeysAsync();
            BuildList();
        }

@@ -551,6 +567,8 @@ namespace Bit.App.Pages
                {
                    Name = AppResources.VaultTimeoutAction,
                    SubLabel = _vaultTimeoutActionDisplayValue,
+                    Description = IsVaultTimeoutActionLockAllowed ? null : AppResources.SetUpAnUnlockMethodToChangeYourVaultTimeoutAction,
+                    Enabled = IsVaultTimeoutActionLockAllowed,
                    ExecuteAsync = () => VaultTimeoutActionAsync()
                },
                new SettingsPageListItem
@@ -566,16 +584,19 @@ namespace Bit.App.Pages
                    ExecuteAsync = () => ApproveLoginRequestsAsync()
                },
                new SettingsPageListItem
-                {
-                    Name = AppResources.LockNow,
-                    ExecuteAsync = () => LockAsync()
-                },
-                new SettingsPageListItem
                {
                    Name = AppResources.TwoStepLogin,
                    ExecuteAsync = () => TwoStepAsync()
                }
            };
+            if (IsVaultTimeoutActionLockAllowed)
+            {
+                securityItems.Insert(4, new SettingsPageListItem
+                {
+                    Name = AppResources.LockNow,
+                    ExecuteAsync = () => LockAsync()
+                });
+            }
            if (_approvePasswordlessLoginRequests)
            {
                manageItems.Add(new SettingsPageListItem
@@ -835,9 +856,11 @@ namespace Bit.App.Pages
            return _vaultTimeoutOptions.FirstOrDefault(o => o.Key == key).Value;
        }

-        private string CreateSelectableOption(string option, bool selected) => selected ? $"✓ {option}" : option;
+        private string CreateSelectableOption(string option, bool selected) => selected ? ToSelectedOption(option) : option;

-        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == $"✓ {compareTo}";
+        private bool CompareSelection(string selection, string compareTo) => selection == compareTo || selection == ToSelectedOption(compareTo);
+
+        private string ToSelectedOption(string option) => $"✓ {option}";

        public async Task SetScreenCaptureAllowedAsync()
        {
@@ -869,5 +892,17 @@ namespace Bit.App.Pages
            await _watchDeviceService.SetShouldConnectToWatchAsync(_shouldConnectToWatch);
            BuildList();
        }
+
+        private async Task UpdateVaultTimeoutActionIfNeededAsync()
+        {
+            if (IsVaultTimeoutActionLockAllowed)
+            {
+                return;
+            }
+
+            _vaultTimeoutActionDisplayValue = _vaultTimeoutActionOptions.First(o => o.Value == VaultTimeoutAction.Logout).Key;
+            await _vaultTimeoutService.SetVaultTimeoutOptionsAsync(_vaultTimeout, VaultTimeoutAction.Logout);
+            _deviceActionService.Toast(AppResources.VaultTimeoutActionChangedToLogOut);
+        }
    }
 }
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -94,7 +94,7 @@ namespace Bit.App.Pages
                }
            });
            await UpdateVaultButtonTitleAsync();
-            if (await _keyConnectorService.UserNeedsMigration())
+            if (await _keyConnectorService.UserNeedsMigrationAsync())
            {
                _messagingService.Send("convertAccountToKeyConnector");
            }
--- a/src/App/Pages/Vault/AttachmentsPageViewModel.cs
+++ b/src/App/Pages/Vault/AttachmentsPageViewModel.cs
@@ -74,7 +74,7 @@ namespace Bit.App.Pages
            _cipherDomain = await _cipherService.GetAsync(CipherId);
            Cipher = await _cipherDomain.DecryptAsync();
            LoadAttachments();
-            _hasUpdatedKey = await _cryptoService.HasEncKeyAsync();
+            _hasUpdatedKey = await _cryptoService.HasUserKeyAsync();
            var canAccessPremium = await _stateService.CanAccessPremiumAsync();
            _canAccessAttachments = canAccessPremium || Cipher.OrganizationId != null;
            if (!_canAccessAttachments)
--- a/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
@@ -82,7 +82,7 @@ namespace Bit.App.Pages
                return;
            }

-            if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
+            if (!await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Reprompt))
            {
                return;
            }
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
@@ -21,7 +21,7 @@ namespace Bit.App.Pages
        private readonly IDeviceActionService _deviceActionService;
        private readonly IAutofillHandler _autofillHandler;
        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly IKeyConnectorService _keyConnectorService;
+        private readonly IUserVerificationService _userVerificationService;

        private CipherAddEditPageViewModel _vm;
        private bool _fromAutofill;
@@ -43,7 +43,7 @@ namespace Bit.App.Pages
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
-            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
+            _userVerificationService = ServiceContainer.Resolve<IUserVerificationService>();

            _appOptions = appOptions;
            _fromAutofill = fromAutofill;
@@ -175,8 +175,8 @@ namespace Bit.App.Pages
                    RequestFocus(_nameEntry);
                }
            });
-            // Hide password reprompt option if using key connector
-            _passwordPrompt.IsVisible = !await _keyConnectorService.GetUsesKeyConnector();
+
+            _passwordPrompt.IsVisible = await _userVerificationService.HasMasterPasswordAsync();
        }

        protected override void OnDisappearing()
--- a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
@@ -698,12 +698,12 @@ namespace Bit.App.Pages

        public async Task<bool> PromptPasswordAsync()
        {
-            if (Cipher.Reprompt == CipherRepromptType.None || _passwordReprompted)
+            if (_passwordReprompted)
            {
                return true;
            }

-            return _passwordReprompted = await _passwordRepromptService.ShowPasswordPromptAsync();
+            return _passwordReprompted = await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(Cipher.Reprompt);
        }

        private async Task<bool> CanCloneAsync()
--- a/src/App/Pages/Vault/CiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/CiphersPageViewModel.cs
@@ -191,7 +191,7 @@ namespace Bit.App.Pages

            if (_appOptions?.OtpData != null)
            {
-                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
+                if (!await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Reprompt))
                {
                    return;
                }
@@ -208,7 +208,7 @@ namespace Bit.App.Pages
            }
            else if (selection == AppResources.Autofill || selection == AppResources.AutofillAndSave)
            {
-                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
+                if (!await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Reprompt))
                {
                    return;
                }
--- a/src/App/Pages/Vault/OTPCipherSelectionPageViewModel.cs
+++ b/src/App/Pages/Vault/OTPCipherSelectionPageViewModel.cs
@@ -60,7 +60,7 @@ namespace Bit.App.Pages

            var cipher = listItem.Cipher;

-            if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
+            if (!await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Reprompt))
            {
                return;
            }
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -418,6 +418,24 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to addy.io.
+        /// </summary>
+        public static string AddyIo {
+            get {
+                return ResourceManager.GetString("AddyIo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Admin approval requested.
+        /// </summary>
+        public static string AdminApprovalRequested {
+            get {
+                return ResourceManager.GetString("AdminApprovalRequested", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to All.
        /// </summary>
@@ -499,15 +517,6 @@ namespace Bit.App.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to AnonAddy.
-        /// </summary>
-        public static string AnonAddy {
-            get {
-                return ResourceManager.GetString("AnonAddy", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to A notification has been sent to your device..
        /// </summary>
@@ -571,6 +580,24 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Approve with master password.
+        /// </summary>
+        public static string ApproveWithMasterPassword {
+            get {
+                return ResourceManager.GetString("ApproveWithMasterPassword", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Approve with my other device.
+        /// </summary>
+        public static string ApproveWithMyOtherDevice {
+            get {
+                return ResourceManager.GetString("ApproveWithMyOtherDevice", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to April.
        /// </summary>
@@ -3694,6 +3721,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Logged in!.
+        /// </summary>
+        public static string LoggedIn {
+            get {
+                return ResourceManager.GetString("LoggedIn", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Logged in as {0} on {1}..
        /// </summary>
@@ -3712,6 +3748,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Logging in as {0}.
+        /// </summary>
+        public static string LoggingInAsX {
+            get {
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Logging in as {0} on {1}.
        /// </summary>
@@ -3721,6 +3766,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Logging in on.
+        /// </summary>
+        public static string LoggingInOn {
+            get {
+                return ResourceManager.GetString("LoggingInOn", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Log In.
        /// </summary>
@@ -3739,6 +3793,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Login approved.
+        /// </summary>
+        public static string LoginApproved {
+            get {
+                return ResourceManager.GetString("LoginApproved", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Login attempt by {0} on {1}.
        /// </summary>
@@ -3778,7 +3841,7 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Log in initiated.
+        ///   Looks up a localized string similar to Login initiated.
        /// </summary>
        public static string LogInInitiated {
            get {
@@ -3876,6 +3939,24 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Log in with device.
+        /// </summary>
+        public static string LogInWithDevice {
+            get {
+                return ResourceManager.GetString("LogInWithDevice", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Log in with device must be set up in the settings of the Bitwarden app. Need another option?.
+        /// </summary>
+        public static string LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption {
+            get {
+                return ResourceManager.GetString("LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Log in with master password.
        /// </summary>
@@ -5336,6 +5417,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Remember this device.
+        /// </summary>
+        public static string RememberThisDevice {
+            get {
+                return ResourceManager.GetString("RememberThisDevice", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Remove.
        /// </summary>
@@ -5408,6 +5498,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Request admin approval.
+        /// </summary>
+        public static string RequestAdminApproval {
+            get {
+                return ResourceManager.GetString("RequestAdminApproval", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Request one-time password.
        /// </summary>
@@ -5903,6 +6002,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Set up an unlock method to change your vault timeout action..
+        /// </summary>
+        public static string SetUpAnUnlockMethodToChangeYourVaultTimeoutAction {
+            get {
+                return ResourceManager.GetString("SetUpAnUnlockMethodToChangeYourVaultTimeoutAction", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Set up TOTP.
        /// </summary>
@@ -6269,10 +6377,10 @@ namespace Bit.App.Resources {
        public static string ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem {
            get {
                return ResourceManager.GetString("ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem", resourceCulture);
-        
            }
        }
        
+        /// <summary>
        ///   Looks up a localized string similar to There are no blocked URIs.
        /// </summary>
        public static string ThereAreNoBlockedURIs {
@@ -6435,6 +6543,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Trouble logging in?.
+        /// </summary>
+        public static string TroubleLoggingIn {
+            get {
+                return ResourceManager.GetString("TroubleLoggingIn", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Try again.
        /// </summary>
@@ -6444,6 +6561,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Turn off using a public device.
+        /// </summary>
+        public static string TurnOffUsingPublicDevice {
+            get {
+                return ResourceManager.GetString("TurnOffUsingPublicDevice", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to 20 seconds.
        /// </summary>
@@ -6634,7 +6760,7 @@ namespace Bit.App.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve..
+        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve..
        /// </summary>
        public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
            get {
@@ -6975,6 +7101,15 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Vault timeout action changed to log out.
+        /// </summary>
+        public static string VaultTimeoutActionChangedToLogOut {
+            get {
+                return ResourceManager.GetString("VaultTimeoutActionChangedToLogOut", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Your organization policies have set your vault timeout action to {0}..
        /// </summary>
@@ -7353,6 +7488,24 @@ namespace Bit.App.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Your request has been sent to your admin..
+        /// </summary>
+        public static string YourRequestHasBeenSentToYourAdmin {
+            get {
+                return ResourceManager.GetString("YourRequestHasBeenSentToYourAdmin", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You will be notified once approved. .
+        /// </summary>
+        public static string YouWillBeNotifiedOnceApproved {
+            get {
+                return ResourceManager.GetString("YouWillBeNotifiedOnceApproved", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device&apos;s USB port, then touch its button..
        /// </summary>
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -2413,9 +2413,9 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
  <data name="Service" xml:space="preserve">
    <value>Diens</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@ Wil u na die rekening omskakel?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Huidige hoofwagwoord</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Wil u na die rekening omskakel?</value>
    <value>Hulpteks vir vra weer vir hoofwagwoord</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Ontgrendeling kan misluk as daar onvoldoende geheue is. Verminder u KDF-geheue-instellings om dit op te los.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Ongeldige API-sleutel</value>
@@ -2667,6 +2685,24 @@ Wil u na die rekening omskakel?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Ongeldige API-teken</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ Wil u na die rekening omskakel?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ar.resx
+++ b/src/App/Resources/AppResources.ar.resx
@@ -125,14 +125,14 @@
    <comment>Add/create a new entity (verb).</comment>
  </data>
  <data name="AddFolder" xml:space="preserve">
-    <value>مجلد مضاف</value>
+    <value>إضافة مجلّد</value>
  </data>
  <data name="AddItem" xml:space="preserve">
-    <value>تمت إضافة العنصر</value>
+    <value>إضافة عنصر</value>
    <comment>The title for the add item page.</comment>
  </data>
  <data name="AnErrorHasOccurred" xml:space="preserve">
-    <value>كان هناك خطأ.</value>
+    <value>لقد حدث خطأ.</value>
    <comment>Alert title when something goes wrong.</comment>
  </data>
  <data name="Back" xml:space="preserve">
@@ -140,7 +140,7 @@
    <comment>Navigate back to the previous screen.</comment>
  </data>
  <data name="Bitwarden" xml:space="preserve">
-    <value>bitwarden</value>
+    <value>Bitwarden</value>
    <comment>App name. Shouldn't ever change.</comment>
  </data>
  <data name="Cancel" xml:space="preserve">
@@ -156,11 +156,11 @@
    <comment>The button text that allows a user to copy the login's password to their clipboard.</comment>
  </data>
  <data name="CopyUsername" xml:space="preserve">
-    <value>المصادقة باستخدام FIDO2 WebAuthn، يمكنك المصادقة باستخدام مفتاح أمان خارجي.</value>
+    <value>انسخ اسم المستخدم</value>
    <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>شكر وتقدير</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,42 +168,42 @@
    <comment>Delete an entity (verb).</comment>
  </data>
  <data name="Deleting" xml:space="preserve">
-    <value>حذف ...</value>
+    <value>جارِ الحذف...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>هل أنت متأكد من أنك تريد الحذف؟ لا يمكن إلغاؤه</value>
+    <value>هل تريد حقا أن تحذف؟ هذا لا يمكن التراجع عنها.</value>
    <comment>Confirmation alert message when deleteing something.</comment>
  </data>
  <data name="Edit" xml:space="preserve">
    <value>تعديل</value>
  </data>
  <data name="EditFolder" xml:space="preserve">
-    <value>تعديل مجلد</value>
+    <value>تحرير المجلد</value>
  </data>
  <data name="Email" xml:space="preserve">
    <value>بريد الكتروني</value>
    <comment>Short label for an email address.</comment>
  </data>
  <data name="EmailAddress" xml:space="preserve">
-    <value>عنوان بريد الكتروني</value>
+    <value>عنوان البريد الإلكتروني</value>
    <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>
+    <value>أرسل لنا رسالة مباشرة للحصول على المساعدة أو ترك ملاحظات.</value>
  </data>
  <data name="EnterPIN" xml:space="preserve">
-    <value>أدخل رقم التعريف الشخصي الخاص بك.</value>
+    <value>أدخل رَقم تعريفك الشخصي.</value>
  </data>
  <data name="Favorites" xml:space="preserve">
    <value>المفضلات</value>
    <comment>Title for your favorite items in the vault.</comment>
  </data>
  <data name="FileBugReport" xml:space="preserve">
-    <value>إرسال تقرير خطأ</value>
+    <value>إرسال تقرير عن خطأ</value>
  </data>
  <data name="FileBugReportDescription" xml:space="preserve">
    <value>افتح تذكرة في مستودع Github لدينا.</value>
@@ -212,42 +212,42 @@
    <value>استخدم بصمة إصبعك للتعريف بنفسك.</value>
  </data>
  <data name="Folder" xml:space="preserve">
-    <value>مجلد</value>
+    <value>المجلد</value>
    <comment>Label for a folder.</comment>
  </data>
  <data name="FolderCreated" xml:space="preserve">
-    <value>مجلد جديد أنشئ</value>
+    <value>نشأ مجلد جديد.</value>
  </data>
  <data name="FolderDeleted" xml:space="preserve">
-    <value>مجلد محذوف</value>
+    <value>حذفت المجلد.</value>
  </data>
  <data name="FolderNone" xml:space="preserve">
    <value>لا مجلد</value>
    <comment>Items that have no folder specified go in this special "catch-all" folder.</comment>
  </data>
  <data name="Folders" xml:space="preserve">
-    <value>مجلدات</value>
+    <value>المجلدات</value>
  </data>
  <data name="FolderUpdated" xml:space="preserve">
-    <value>مجلد محدّث</value>
+    <value>حُفظ المجلد</value>
  </data>
  <data name="GoToWebsite" xml:space="preserve">
-    <value>زر الموقع الالكتروني</value>
+    <value>الذهاب إلى الموقع الالكتروني</value>
    <comment>The button text that allows user to launch the website to their web browser.</comment>
  </data>
  <data name="HelpAndFeedback" xml:space="preserve">
-    <value>مساعدة ورجوع</value>
+    <value>المساعدة و الملاحظات</value>
  </data>
  <data name="Hide" xml:space="preserve">
    <value>إخفاء</value>
    <comment>Hide a secret value that is currently shown (password).</comment>
  </data>
  <data name="InternetConnectionRequiredMessage" xml:space="preserve">
-    <value>عليك الاتصال بالانترنت قبل المواصلة</value>
+    <value>عليك الاتصال بالإنترنت قبل المواصلة.</value>
    <comment>Description message for the alert when internet connection is required to continue.</comment>
  </data>
  <data name="InternetConnectionRequiredTitle" xml:space="preserve">
-    <value>اتصال بالانترنت مطلوب</value>
+    <value>الاتصال بالإنترنت مطلوب</value>
    <comment>Title for the alert when internet connection is required to continue.</comment>
  </data>
  <data name="InvalidMasterPassword" xml:space="preserve">
@@ -261,11 +261,11 @@
    <comment>The button text that allows user to launch the website to their web browser.</comment>
  </data>
  <data name="LogIn" xml:space="preserve">
-    <value>تعريف</value>
+    <value>تسجيل الدخول</value>
    <comment>The login button text (verb).</comment>
  </data>
  <data name="LogInNoun" xml:space="preserve">
-    <value>اسم المستخدم</value>
+    <value>تسجيل الدخول</value>
    <comment>Title for login page. (noun)</comment>
  </data>
  <data name="LogOut" xml:space="preserve">
@@ -330,11 +330,11 @@
    <value>نقل</value>
  </data>
  <data name="Saving" xml:space="preserve">
-    <value>حفظ...</value>
+    <value>جارِ حفظ...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Settings" xml:space="preserve">
-    <value>إعدادات</value>
+    <value>الإعدادات</value>
    <comment>The title for the settings page.</comment>
  </data>
  <data name="Show" xml:space="preserve">
@@ -360,7 +360,7 @@
    <comment>The title for the tools page.</comment>
  </data>
  <data name="URI" xml:space="preserve">
-    <value>الرابط</value>
+    <value>عنوان الـ URI</value>
    <comment>Label for a uri/url.</comment>
  </data>
  <data name="UseFingerprintToUnlock" xml:space="preserve">
@@ -464,7 +464,7 @@
    <value>إنشاء حساب</value>
  </data>
  <data name="CreatingAccount" xml:space="preserve">
-    <value>إنشاء الحساب...</value>
+    <value>جارِ إنشاء الحساب...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="EditItem" xml:space="preserve">
@@ -493,16 +493,16 @@
    <value>احصل على إمكانية الوصول الفوري إلى كلمات المرور الخاصة بك!</value>
  </data>
  <data name="ExtensionReady" xml:space="preserve">
-    <value>أنت مستعد للتعريف بنفسك!</value>
+    <value>أنت مستعد لتسجيل الدخول!</value>
  </data>
  <data name="ExtensionSetup" xml:space="preserve">
    <value>يمكن الآن الوصول إلى المعرفات الخاصة بك بسهولة من Safari وChrome والتطبيقات الأخرى المدعومة.</value>
  </data>
  <data name="ExtensionSetup2" xml:space="preserve">
-    <value>في Safari و Chrome، ابحث عن bitwarden باستخدام رمز المشاركة (المساعدة: انتقل إلى اليمين في السطر السفلي من القائمة).</value>
+    <value>في Safari و Chrome، ابحث عن bitwarden باستخدام أيقونة المشاركة (المساعدة: انتقل إلى اليمين في السطر السفلي من القائمة).</value>
  </data>
  <data name="ExtensionTapIcon" xml:space="preserve">
-    <value>اضغط على رمز bitwarden في القائمة لإطلاق الملحق.</value>
+    <value>اضغط على أيقونة Bitwarden في القائمة لإطلاق الملحق.</value>
  </data>
  <data name="ExtensionTurnOn" xml:space="preserve">
    <value>لتنشيط bitwarden على Safari والتطبيقات الأخرى، اضغط على رمز "المزيد" على السطر السفلي من القائمة.</value>
@@ -514,10 +514,10 @@
    <value>البصمة</value>
  </data>
  <data name="GeneratePassword" xml:space="preserve">
-    <value>إنشاء كلمة مرور</value>
+    <value>توليد كلمة مرور</value>
  </data>
  <data name="GetPasswordHint" xml:space="preserve">
-    <value>الحصول على دليل كلمة المرور الرئيسية</value>
+    <value>احصل على تلميح لكلمة مرورك الرئيسية</value>
  </data>
  <data name="ImportItems" xml:space="preserve">
    <value>استيراد العناصر</value>
@@ -532,7 +532,7 @@
    <value>آخر مزامنة:</value>
  </data>
  <data name="Length" xml:space="preserve">
-    <value>طول</value>
+    <value>الطول</value>
  </data>
  <data name="Lock" xml:space="preserve">
    <value>قفل</value>
@@ -562,11 +562,11 @@
    <value>سيؤدي تسجيل الخروج إلى إزالة جميع الوصول إلى الخزنة الخاصة بك ويتطلب المصادقة عبر الإنترنت بعد انتهاء المهلة. هل أنت متأكد من أنك تريد استخدام هذا الإعداد؟</value>
  </data>
  <data name="LoggingIn" xml:space="preserve">
-    <value>تعريف...</value>
+    <value>جارِ تسجيل الدخول...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="LoginOrCreateNewAccount" xml:space="preserve">
-    <value>قم بالتسجيل أو إنشاء حساب جديد للوصول إلى خزنتك الآمنة.</value>
+    <value>قم بتسجيل الدخول أو إنشاء حساب جديد للوصول إلى خزنتك الآمنة.</value>
  </data>
  <data name="Manage" xml:space="preserve">
    <value>إدارة</value>
@@ -598,7 +598,7 @@
    <value>المزيد من الإعدادات</value>
  </data>
  <data name="MustLogInMainApp" xml:space="preserve">
-    <value>تحتاج إلى التعريف بنفسك على التطبيق bitwarden الرئيسي قبل استخدام الامتداد.</value>
+    <value>يجب عليك تسجيل الدخول إلى تطبيق Bitwarden الرئيسي قبل استخدام الامتداد.</value>
  </data>
  <data name="Never" xml:space="preserve">
    <value>أبداً</value>
@@ -623,25 +623,25 @@
    <comment>Confirmation, like "Ok, I understand it"</comment>
  </data>
  <data name="OptionDefaults" xml:space="preserve">
-    <value>يتم تعيين الخيارات الافتراضية من أداة إنشاء كلمة المرور في تطبيق bitwarden الرئيسي.</value>
+    <value>يتم تعيين الخيارات الافتراضية من أداة إنشاء كلمة المرور في تطبيق Bitwarden الرئيسي.</value>
  </data>
  <data name="Options" xml:space="preserve">
-    <value>خيارات</value>
+    <value>الخيارات</value>
  </data>
  <data name="Other" xml:space="preserve">
    <value>الأخرى</value>
  </data>
  <data name="PasswordGenerated" xml:space="preserve">
-    <value>كلمة المرور التي تم إنشاؤها.</value>
+    <value>كلمة المرور المولدة</value>
  </data>
  <data name="PasswordGenerator" xml:space="preserve">
    <value>مولد كلمة المرور</value>
  </data>
  <data name="PasswordHint" xml:space="preserve">
-    <value>فهرس كلمة المرور</value>
+    <value>تلميح كلمة المرور</value>
  </data>
  <data name="PasswordHintAlert" xml:space="preserve">
-    <value>أرسلنا بريدًا إلكترونيًا مع دليل كلمة المرور الخاص بك.</value>
+    <value>لقد أرسلنا لك رسالة بريد إلكتروني تحتوي على تلميح لكلمة مرورك الرئيسية.</value>
  </data>
  <data name="PasswordOverrideAlert" xml:space="preserve">
    <value>هل أنت متأكد من أنك تريد سحق كلمة المرور الموجودة؟</value>
@@ -657,7 +657,7 @@
    <value>شكرا على مساعدتنا من خلال كتابة تعليق إيجابي!</value>
  </data>
  <data name="RegeneratePassword" xml:space="preserve">
-    <value>إعادة إنشاء كلمة مرور</value>
+    <value>إعادة توليد كلمة المرور</value>
  </data>
  <data name="RetypeMasterPassword" xml:space="preserve">
    <value>إعادة إدخال كلمة المرور الرئيسية</value>
@@ -684,11 +684,11 @@
    <value>تم تحديث العنصر</value>
  </data>
  <data name="Submitting" xml:space="preserve">
-    <value>تقديم...</value>
+    <value>جارِ الإرسال...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="Syncing" xml:space="preserve">
-    <value>المزامنة...</value>
+    <value>جارِ المزامنة...</value>
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="SyncingComplete" xml:space="preserve">
@@ -701,14 +701,14 @@
    <value>مزامنة الخزنة الآن</value>
  </data>
  <data name="TouchID" xml:space="preserve">
-    <value>Touch ID معرف اتصال</value>
+    <value>Touch ID معرف اتصال البصمة</value>
    <comment>What Apple calls their fingerprint reader.</comment>
  </data>
  <data name="TwoStepLogin" xml:space="preserve">
    <value>تحديد المصادقة الثنائية</value>
  </data>
  <data name="TwoStepLoginConfirmation" xml:space="preserve">
-    <value>تجعل المصادقة الثنائية المعامل حسابك أكثر أمانًا من خلال طلب إدخال رمز أمان مع كل معرف من تطبيق المصادقة. يمكن تنشيط تعريف العامل المزدوج في خزنة الويب في bitwarden.com. هل تريد زيارة الموقع الآن؟</value>
+    <value>تجعل المصادقة الثنائية المعامل حسابك أكثر أمانًا من خلال طلب إدخال رمز أمان مع كل معرف من تطبيق المصادقة. يمكن تنشيط تعريف العامل المزدوج في خزنة الويب في bitwarden.com هل تريد زيارة الموقع الآن؟</value>
  </data>
  <data name="UnlockWith" xml:space="preserve">
    <value>فتح مع {0}</value>
@@ -879,7 +879,7 @@
    <value>لا يمكن لجهازك فتح هذا النوع من الملفات.</value>
  </data>
  <data name="Downloading" xml:space="preserve">
-    <value>تحميل...</value>
+    <value>جارِ التحميل...</value>
    <comment>Message shown when downloading a file</comment>
  </data>
  <data name="AttachmentLargeWarning" xml:space="preserve">
@@ -1035,7 +1035,7 @@
    <value>أغسطس</value>
  </data>
  <data name="Brand" xml:space="preserve">
-    <value>العلامة</value>
+    <value>العلامة التجارية</value>
  </data>
  <data name="CardholderName" xml:space="preserve">
    <value>اسم حامل البطاقة</value>
@@ -1077,7 +1077,7 @@
    <value>يونيو</value>
  </data>
  <data name="LastName" xml:space="preserve">
-    <value>اسم العائلة</value>
+    <value>الأسم الأخير</value>
  </data>
  <data name="FullName" xml:space="preserve">
    <value>الاسم الكامل</value>
@@ -1337,7 +1337,7 @@
    <value>الهويات</value>
  </data>
  <data name="Logins" xml:space="preserve">
-    <value>معرفات</value>
+    <value>تسجيلات الدخول</value>
  </data>
  <data name="SecureNotes" xml:space="preserve">
    <value>ملاحظات آمنة</value>
@@ -1492,7 +1492,7 @@
    <value>تعيين رمز PIN الخاص بك لإلغاء قفل Bitwarden. سيتم إعادة تعيين إعدادات PIN الخاصة بك إذا قمت بتسجيل الخروج بالكامل من التطبيق.</value>
  </data>
  <data name="LoggedInAsOn" xml:space="preserve">
-    <value>تم تسجيل الدخول كـ {0} في {1}.</value>
+    <value>مسجل الدخول كـ {0} على {1}.</value>
    <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
  </data>
  <data name="VaultLockedMasterPassword" xml:space="preserve">
@@ -1617,7 +1617,7 @@
    <value>إظهار / إخفاء</value>
  </data>
  <data name="LoginExpired" xml:space="preserve">
-    <value>انتهت صلاحية جلسة تسجيل الدخول الخاصة بك.</value>
+    <value>انتهت صَلاحِيَة جَلسة تسجيل دخولك.</value>
  </data>
  <data name="BiometricsDirection" xml:space="preserve">
    <value>المصادقة البيومترية</value>
@@ -2328,7 +2328,7 @@
    <value>هل تحاول تسجيل الدخول؟</value>
  </data>
  <data name="LogInAttemptByXOnY" xml:space="preserve">
-    <value>محاولة تسجيل الدخول بواسطة {0} في {1}</value>
+    <value>محاولة تسجيل الدخول بواسطة {0} على {1}</value>
  </data>
  <data name="DeviceType" xml:space="preserve">
    <value>نوع الجهاز</value>
@@ -2414,9 +2414,9 @@
  <data name="Service" xml:space="preserve">
    <value>الخدمة</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>FirefoxRelay</value>
@@ -2628,90 +2628,138 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>كلمة المرور الرئيسية الحالية</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>سجلت دخولك!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>الموافقة بجهازي الآخر</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>طلب موافقة المسؤول</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>الموافقة بكلمة مرور رئيسية</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>أوقف باستخدام جهاز عمومي</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>تذكر هذا الجهاز</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>مفتاح المرور</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>مفاتيح المرور</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>أُنشِئ {0}</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>تطبيق</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>لا يمكنك تعديل تطبيق مفتاح المرور لأنه سيبطل مفتاح المرور</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>لن يتم نسخ مفتاح المرور</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>لن يتم نسخ مفتاح المرور إلى العنصر المستنسخ. هل تريد الاستمرار في استنساخ هذا العنصر؟</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>نسخ التطبيق</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>متاح لتسجيل الدخول بخطوتين</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
+    <value>مساعدة إعادة طلب كلمة المرور الرئيسية</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>قد يفشل إلغاء القُفْل بسبب عدم كفاية الذاكرة. قم بتقليل إعدادات ذاكرة KDF أو قم بإعداد إلغاء القُفْل البيومتري لحل المشكلة.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
+    <value>مفتاح API غير صالح</value>
  </data>
  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
+    <value>رمز API غير صالح</value>
+  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>طلبت موافقة المسؤول</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>أرسلت طلبك إلى مسؤولك.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>سيتم إخطارك بمجرد الموافقة عليها. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>مشكلة في تسجيل الدخول؟</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>تسجيل الدخول كـ {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>تَغيير إجراء مهلة المخزن لتسجيل الخروج</value>
  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>لا يمكن مشاركة هذا العنصر مع المؤسسة لأنه يوجد بالفعل واحد مع نفس مفتاح المرور.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
+    <value>حظر التعبئة التلقائية</value>
  </data>
  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
+    <value>لن يتم تقديم التعبئة التلقائية لعناوين الـ URIs هذه.</value>
  </data>
  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
+    <value>عنوان URL جديد محظور</value>
  </data>
  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
+    <value>تم حفظ عنوان URI</value>
  </data>
  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
+    <value>تنسيق غير صالح. استخدم https:// أو http:// أو androidapp://</value>
    <comment>https://, http://, androidapp:// should not be translated</comment>
  </data>
  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
+    <value>تعديل عنوان URI</value>
  </data>
  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
+    <value>إدخال URI</value>
  </data>
  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
+    <value>التنسيق: {0}. افصل العديد من عناوين URIs بفاصلة.</value>
  </data>
  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
+    <value>التنسيق: {0}</value>
  </data>
  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
+    <value>الرابط غير صالح</value>
  </data>
  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
+    <value>تم حذف الرابط</value>
  </data>
  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
+    <value>لا يوجد أي عناوين URIs محظورة</value>
  </data>
  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
+    <value>تم حظر URI {0} بالفعل</value>
  </data>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
+    <value>لا يمكن تعديل العديد من عناوين URIs في وقت واحد</value>
+  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>تمت الموافقة على تسجيل الدخول</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>يجب إعداد تسجيل الدخول باستخدام الجهاز في إعدادات تطبيق Bitwarden. هل تحتاج إلى خِيار آخر؟</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>تسجيل الدخول بالجهاز</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>جارٍ تسجيل الدخول</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -2412,9 +2412,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
  <data name="Service" xml:space="preserve">
    <value>Xidmət</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Hazırkı ana parol</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Giriş edildi!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Digər cihazımla təsdiqlə</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Admin təsdiqini tələb et</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Ana parolla təsdiqlə</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Hər kəsə açıq bir cihaz istifadə edərək söndür</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Bu cihazı xatırla</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2658,7 +2676,7 @@ Bu hesaba keçmək istəyirsiniz?</value>
    <value>Ana parolu təkrar soruş köməyi</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Yetərsiz yaddaşa görə kilid açma uğursuz ola bilər. Həll etmək üçün KDF yaddaş tənzimləmələrinizi azaldın</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Yararsız API açarı</value>
@@ -2666,6 +2684,24 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Yararsız API tokeni</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin təsdiqi tələb olunur</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Tələbiniz admininizə göndərildi.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Təsdiqləndikdən sonra məlumatlandırılacaqsınız. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Girişdə problem var?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} olaraq giriş edilir</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Anbar vaxt bitməsi əməliyyatı "çıxış et" olaraq dəyişdirildi</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2712,4 +2748,16 @@ Bu hesaba keçmək istəyirsiniz?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Bir dəfəyə bir neçə URI-a düzəliş etmək mümkün deyil</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Giriş təsdiqləndi</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Cihazla giriş etmə, Bitwarden tətbiqinin tənzimləmələrində quraşdırılmalıdır. Başqa bir seçimə ehtiyacınız var?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Cihazla giriş et</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Giriş edilir</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.be.resx
+++ b/src/App/Resources/AppResources.be.resx
@@ -2413,9 +2413,9 @@
  <data name="Service" xml:space="preserve">
    <value>Сэрвіс</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Бягучы асноўны пароль</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2638,7 +2656,7 @@
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>Праграма</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
    <value>You cannot edit passkey application because it would invalidate the passkey</value>
@@ -2659,7 +2677,7 @@
    <value>Дапамога з паўторным запытам асноўнага пароля</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Па прычыне недахопу памяці можа адбыцца збой разблакіроўкі. Паменшыце налады памяці KDF, каб вырашыць гэту праблему</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Памылковы ключ API</value>
@@ -2667,6 +2685,24 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Памылковы токен API</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Немагчыма рэдагаваць некалькі URI адначасова</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.bg.resx
+++ b/src/App/Resources/AppResources.bg.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Услуга</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@ select Add TOTP to store the key safely</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Текуща главна парола</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Вписахте се!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Одобряване с другото ми устройство</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Подаване на заявка за одобрение от администратор</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Одобряване с главната парола</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Изключване на използването на публично устройство</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Запомняне на това устройство</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2653,13 +2671,13 @@ select Add TOTP to store the key safely</value>
    <value>Копиране на приложението</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Налично за двустепенно удостоверяване</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Помощ за повторното запитване за главната парола</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Отключването може да бъде неуспешно заради недостатъчно памет. Намалете настройките на паметта за KDF, за да разрешите проблема.</value>
+    <value>Отключването може да бъде неуспешно заради недостатъчно памет. Намалете настройките на паметта за KDF или настройте отключването чрез биометрични данни, за да разрешите проблема.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Неправилен ключ за ППИ</value>
@@ -2667,6 +2685,24 @@ select Add TOTP to store the key safely</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Неправилен идентификатор за ППИ</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Заявено е одобрение от администратор</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Вашата заявка беше изпратена до администратора Ви.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Ще получите известие, когато тя бъде одобрена. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Имате проблем с вписването?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Вписване като {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Действието при изтичане на времето за достъп до трезора е променено на отписване</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ select Add TOTP to store the key safely</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Не може да редактирате повече от един адрес едновременно</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Вписването е одобрено</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Вписването с устройство трябва да е включено в настройките на приложението на Битуорден. Друга настройка ли търсите?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Вписване с устройство</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Вписване в</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.bn.resx
+++ b/src/App/Resources/AppResources.bn.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.bs.resx
+++ b/src/App/Resources/AppResources.bs.resx
@@ -2412,9 +2412,9 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2658,7 +2676,7 @@ Skeniranje će biti izvršeno automatski.</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2666,6 +2684,24 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2712,4 +2748,16 @@ Skeniranje će biti izvršeno automatski.</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ca.resx
+++ b/src/App/Resources/AppResources.ca.resx
@@ -2413,9 +2413,9 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
  <data name="Service" xml:space="preserve">
    <value>Servei</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,39 +2627,57 @@ Voleu canviar a aquest compte?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Contrasenya mestra actual</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Connectat!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Aproveu des d'un altre dispositiu vostre</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Sol·liciteu l'aprovació de l'administrador</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Aprova amb contrasenya mestra</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Apagueu amb un dispositiu públic</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Recorda aquest dispositiu</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>Clau de pas</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>Claus de pas</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>Creats {0}</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>Aplicació</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>No podeu editar l'aplicació de clau de pas perquè invalidaria la clau de pas</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>La clau de pas no es copiarà</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>La clau de pas no es copiarà a l'element clonat. Voleu continuar clonant aquest element?</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>Copia la aplicació</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Disponible per iniciar sessió en dos passos</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Ajuda per tornar a demanar la contrasenya mestra</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>El desbloqueig pot fallar a causa de memòria insuficient. Disminueix la configuració de memòria KDF per resoldre-ho</value>
+    <value>El desbloqueig pot fallar a causa de memòria insuficient. Disminueix la configuració de memòria KDF per resoldre-ho.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Clau API no vàlida</value>
@@ -2667,50 +2685,80 @@ Voleu canviar a aquest compte?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token API no vàlid</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>S'ha sol·licitat l'aprovació de l'administrador</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>La vostra sol·licitud s'ha enviat a l'administrador.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Se us notificarà una vegada aprovat. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Teniu problemes per iniciar la sessió?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Connectat com {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>L'acció de temps d'espera de la caixa forta ha canviat per tancar la sessió</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>Aquest element no es pot compartir amb l'organització perquè ja n'hi ha un amb la mateixa clau de pas.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
+    <value>Bloqueja l'emplenament automàtic</value>
  </data>
  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
+    <value>L'emplenament automàtic no s'oferirà per a aquests URI.</value>
  </data>
  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
+    <value>Nou URI bloquejat</value>
  </data>
  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
+    <value>URI guardat</value>
  </data>
  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
+    <value>Format no vàlid. Utilitzeu https://, http:// o androidapp://</value>
    <comment>https://, http://, androidapp:// should not be translated</comment>
  </data>
  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
+    <value>Edita URI</value>
  </data>
  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
+    <value>Introduex URI</value>
  </data>
  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
+    <value>Format: {0}. Separa diversos URI amb una coma.</value>
  </data>
  <data name="FormatX" xml:space="preserve">
    <value>Format: {0}</value>
  </data>
  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
+    <value>URI no vàlid</value>
  </data>
  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
+    <value>URI suprimit</value>
  </data>
  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
+    <value>No hi ha cap URI bloquejat</value>
  </data>
  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
+    <value>L'URI {0} ja està bloquejat</value>
  </data>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
+    <value>No es poden editar diversos URI alhora</value>
+  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>S'ha aprovat l'inici de sessió</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>L'inici de sessió amb el dispositiu ha d'estar activat a la configuració de l'aplicació Bitwarden. Necessiteu una altra opció?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Inici de sessió amb dispositiu</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Inici de sessió en</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.cs.resx
+++ b/src/App/Resources/AppResources.cs.resx
@@ -505,7 +505,7 @@
    <value>Pro spuštění rozšíření klepněte  na ikonu Bitwardenu v menu.</value>
  </data>
  <data name="ExtensionTurnOn" xml:space="preserve">
-    <value>Pro zapnutí Bitwardenu v prohlížeči Safari a dalších aplikacích klepněte na ikonu "Více" v dolní části menu.</value>
+    <value>Pro zapnutí Bitwardenu v prohlížeči Safari a dalších aplikacích klepněte na ikonu „Další“ v dolní části menu.</value>
  </data>
  <data name="Favorite" xml:space="preserve">
    <value>Oblíbené</value>
@@ -1304,22 +1304,22 @@ Načtení proběhne automaticky.</value>
    <value>Přistupujte k Vašemu trezoru přímo z Vaší klávesnice pro rychlejší automatické vyplnění hesel.</value>
  </data>
  <data name="AutofillTurnOn" xml:space="preserve">
-    <value>Pokyny pro zapnutí automatického vyplňování hesel na Vašem zařízení:</value>
+    <value>Pokyny pro zapnutí automatického vyplňování hesel na vašem zařízení:</value>
  </data>
  <data name="AutofillTurnOn1" xml:space="preserve">
    <value>1. Přejděte do aplikace "Nastavení" v iOS</value>
  </data>
  <data name="AutofillTurnOn2" xml:space="preserve">
-    <value>2. Klepněte na "Hesla" > "Volby hesla"</value>
+    <value>2. Klepněte na „Hesla“ > „Volby hesla“</value>
  </data>
  <data name="AutofillTurnOn3" xml:space="preserve">
-    <value>3. Zapněte přepínač u položky "Automatické vyplnění hesel"</value>
+    <value>3. Povolte „Automatické vyplnění hesel“</value>
  </data>
  <data name="AutofillTurnOn4" xml:space="preserve">
-    <value>4. Najděte sekci "Povolit vyplňování z:"</value>
+    <value>4. Najděte sekci „Povolit vyplňování z“</value>
  </data>
  <data name="AutofillTurnOn5" xml:space="preserve">
-    <value>5. Zvolte "Bitwarden"</value>
+    <value>5. Zvolte „Bitwarden“</value>
  </data>
  <data name="PasswordAutofill" xml:space="preserve">
    <value>Automatické vyplňování hesel</value>
@@ -2412,9 +2412,9 @@ Načtení proběhne automaticky.</value>
  <data name="Service" xml:space="preserve">
    <value>Služba</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Chcete se přepnout na tento účet?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuální hlavní heslo</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Přihlášeno!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Schválit s mým dalším zařízením</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Žádost o schválení správcem</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Schválit hlavním heslem</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Vypnout pomocí veřejného zařízení</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Zapamatovat toto zařízení</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Přístupový klíč</value>
  </data>
@@ -2658,7 +2676,7 @@ Chcete se přepnout na tento účet?</value>
    <value>Nápověda pro znovuzeptání se na hlavní heslo</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Odemknutí může selhat z důvodu nedostatku paměti. Pro vyřešení snižte nastavení paměti KDF.</value>
+    <value>Odemknutí může selhat z důvodu nedostatku paměti. Snižte nastavení KDF paměti nebo nastavte odemykání pomocí biometrie.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Neplatný klíč API</value>
@@ -2666,6 +2684,24 @@ Chcete se přepnout na tento účet?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Neplatný token API</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Bylo vyžádáno schválení správcem</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Váš požadavek byl odeslán Vašemu správci.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Po schválení budete upozorněni. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Potíže s přihlášením?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Přihlášování jako {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Akce časového limitu trezoru byla změněna na odhlášení</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Tuto položku nelze sdílet s organizací, protože již existuje jedna se stejným přístupovým klíčem.</value>
  </data>
@@ -2712,4 +2748,16 @@ Chcete se přepnout na tento účet?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Najednou nelze upravovat více URI</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Přihlášení bylo schváleno</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Přihlášení zařízením musí být nastaveno v aplikaci Bitwarden. Potřebujete další volby?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Přihlásit se zařízením</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Přihlašování na</value>
+  </data>
 </root>
--- 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
@@ -2413,9 +2413,9 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
  <data name="Service" xml:space="preserve">
    <value>Tjeneste</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,39 +2627,57 @@ Vil du skifte til denne konto?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuel hovedadgangskode</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Indlogget!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Godkend med min anden enhed</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Anmod om admin-godkendelse</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Godkendt med hovedadgangskode</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Slå fra vha. en offentlig enhed</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Husk denne enhed</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>Adgangsnøgle</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>Adgangsnøgler</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>Oprettet {0}</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>Applikation</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>Adgangsnøgleapplikationen kan ikke redigeres, da det ville ugyldiggøre adgangsnøglen</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>Adgangsnøglen kopieres ikke</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>Adgangsnøglen kopieres ikke til det klonede emne. Fortsæt med at klone dette emne alligevel?</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>Kopiér applikation</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Tilgængelig for totrins-login</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Hjælp til genanmodning om hovedadgangskode</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Oplåsning kan fejle grundet utilstrækkelig hukommelse. Reducér KDF-hukommelsesindstillinger for at afhjælpe</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Ugyldig API-nøgle</value>
@@ -2667,8 +2685,26 @@ Vil du skifte til denne konto?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Ugyldigt API-token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin-godkendelse udbedt</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Din anmodning er sendt til din gruppe-admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Du underrettes, når godkendelse foreligger. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Problemer med at logge ind?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logger ind som {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Boks-timeouthandling ændret til udlogning</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>Dette emne kan ikke deles med organisationen, da der allerede er et med den samme adgangsnøgle.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
    <value>Blokér autoudfyldning</value>
@@ -2713,4 +2749,16 @@ Vil du skifte til denne konto?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Kan ikke redigere flere URI'er på én gang</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login godkendt</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Indlogning med enhed skal være opsat i indstillingerne i Bitwarden-appen. Behov for en anden mulighed?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log ind med enhed</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logger ind på</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -598,7 +598,7 @@
    <value>Weitere Einstellungen</value>
  </data>
  <data name="MustLogInMainApp" xml:space="preserve">
-    <value>Du musst dich in der Bitwarden App einloggen, bevor du die Erweiterung benutzen kannst.</value>
+    <value>Du musst dich in der Bitwarden App anmelden, bevor du die Erweiterung benutzen kannst.</value>
  </data>
  <data name="Never" xml:space="preserve">
    <value>Niemals</value>
@@ -838,7 +838,7 @@
    <comment>For 2FA</comment>
  </data>
  <data name="RememberMe" xml:space="preserve">
-    <value>Eingeloggt bleiben</value>
+    <value>Angemeldet bleiben</value>
    <comment>Remember my two-step login</comment>
  </data>
  <data name="SendVerificationCodeAgain" xml:space="preserve">
@@ -1292,7 +1292,7 @@ Das Scannen erfolgt automatisch.</value>
    <value>Auto-Ausfüllen aktiviert!</value>
  </data>
  <data name="MustLogInMainAppAutofill" xml:space="preserve">
-    <value>Du musst dich in der Bitwarden App einloggen, bevor du AutoFill nutzen kannst.</value>
+    <value>Du musst dich in der Bitwarden App anmelden, bevor du AutoFill nutzen kannst.</value>
  </data>
  <data name="AutofillSetup" xml:space="preserve">
    <value>Du kannst nun direkt von der Tastatur auf deine Zugangsdaten zugreifen, wenn du dich auf Webseiten oder in Apps anmeldest.</value>
@@ -2412,9 +2412,9 @@ Das Scannen erfolgt automatisch.</value>
  <data name="Service" xml:space="preserve">
    <value>Dienst</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Aktuelles Master-Passwort</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Angemeldet!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Mit meinem anderen Gerät genehmigen</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Admin-Genehmigung anfordern</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Mit Master-Passwort genehmigen</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Mit einem öffentlichen Gerät ausschalten</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Dieses Gerät merken</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2640,25 +2658,25 @@ Möchtest du zu diesem Konto wechseln?</value>
    <value>Anwendung</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>Du kannst die Passkey-Anwendung nicht bearbeiten, da dies den Passkey ungültig machen würde.</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
    <value>Passkey wird nicht kopiert</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>Der Passkey wird nicht in den duplizierten Eintrag kopiert. Möchtest du mit dem Duplizieren dieses Eintrags fortfahren?</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
    <value>Anwendung kopieren</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Verfügbar für Zwei-Faktor Authentifizierung</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Hilfe zum erneuten Abfragen des Master-Passworts</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Das Entsperren kann aufgrund von unzureichendem Arbeitsspeicher fehlschlagen. Verringere deine KDF-Speichereinstellungen, um das Problem zu beheben.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Ungültiger API-Schlüssel</value>
@@ -2666,8 +2684,26 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Ungültiger API-Token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin-Genehmigung angefordert</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Deine Anfrage wurde an deinen Administrator gesendet.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Du wirst benachrichtigt, sobald sie genehmigt wurde.</value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Probleme beim Einloggen?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Anmelden als {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>Dieser Eintrag kann nicht mit der Organisation geteilt werden, da bereits einer mit dem gleichen Passkey existiert.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
    <value>Auto-Ausfüllen blockieren</value>
@@ -2712,4 +2748,16 @@ Möchtest du zu diesem Konto wechseln?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Es können nicht mehrere URIs auf einmal bearbeitet werden</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login genehmigt</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Die Anmeldung über ein Gerät muss in den Einstellungen der Bitwarden App eingerichtet werden. Benötigst du eine andere Option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Mit Gerät anmelden</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Anmelden bei</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -2413,9 +2413,9 @@
  <data name="Service" xml:space="preserve">
    <value>Υπηρεσία</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,45 +2627,81 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Τρέχων κύριος κωδικός</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>Συνθηματικό</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>Συνθηματικά</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>Δημιουργήθηκε {0}</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>Εφαρμογή</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>Δεν μπορείτε να επεξεργαστείτε την εφαρμογή κλειδιού πρόσβασης επειδή θα ακυρώσει το κλειδί</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>Το κλειδί πρόσβασης δεν θα αντιγραφεί</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>Το κλειδί πρόσβασης δεν θα αντιγραφεί στο κλωνοποιημένο στοιχείο. Θέλετε να συνεχίσετε την κλωνοποίηση αυτού του στοιχείου;</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
    <value>Copy application</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Διαθέσιμο για σύνδεση με δύο βήματα</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Το ξεκλείδωμα μπορεί να αποτύχει λόγω ανεπαρκούς μνήμης. Μειώστε τις ρυθμίσεις μνήμης KDF ή ρυθμίστε το βιομετρικό ξεκλείδωμα για επίλυση.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
+    <value>Μη έγκυρο κλειδί API</value>
  </data>
  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
+    <value>Μη έγκυρο API token</value>
+  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
@@ -2713,4 +2749,16 @@
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2667,6 +2685,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.en-IN.resx
+++ b/src/App/Resources/AppResources.en-IN.resx
@@ -2427,9 +2427,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2641,6 +2641,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2673,7 +2691,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2681,6 +2699,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2727,4 +2763,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -2414,9 +2414,9 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="Service" xml:space="preserve">
    <value>Servicio</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2628,6 +2628,24 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Contraseña maestra actual</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Conectado</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Aprobar con mi otro dispositivo</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
    <value>Ayuda de volver a pedir contraseña maestra</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>El desbloqueo puede fallar por falta de memoria. Disminuye los ajustes de memoria KDF para resolver</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Clave API no válida</value>
@@ -2668,6 +2686,24 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token de API no válido</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.et.resx
+++ b/src/App/Resources/AppResources.et.resx
@@ -2413,9 +2413,9 @@ Skaneerimine toimub automaatselt.</value>
  <data name="Service" xml:space="preserve">
    <value>Teenus</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@ Soovid selle konto peale lülituda?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Praegune ülemparool</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Pääsukood</value>
  </data>
@@ -2659,7 +2677,7 @@ Soovid selle konto peale lülituda?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Avamine võib ebapiisava mälu tõttu nurjuda. Probleemi lahendamiseks vähenda KDF mälu seadeid.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Vigane API võti</value>
@@ -2667,6 +2685,24 @@ Soovid selle konto peale lülituda?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Vigane API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Seda kirjet ei saa organisatsiooniga jagada, sest sama pääsukoodiga kirje juba eksisteerib.</value>
  </data>
@@ -2713,4 +2749,16 @@ Soovid selle konto peale lülituda?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Mitme URI korraga muutmine ei toiminud</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Sisselogimas kui</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.eu.resx
+++ b/src/App/Resources/AppResources.eu.resx
@@ -2412,9 +2412,9 @@
  <data name="Service" xml:space="preserve">
    <value>Zerbitzua</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Uneko pasahitz nagusia</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2658,7 +2676,7 @@ Kontu honetara aldatu nahi duzu?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>API giltza baliogabea</value>
@@ -2666,6 +2684,24 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>API kode baliogabia</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2712,4 +2748,16 @@ Kontu honetara aldatu nahi duzu?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.fa.resx
+++ b/src/App/Resources/AppResources.fa.resx
@@ -2414,9 +2414,9 @@
  <data name="Service" xml:space="preserve">
    <value>سرویس</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>رله فایرفاکس</value>
@@ -2628,39 +2628,57 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>کلمه عبور اصلی فعلی</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>کلید عبور</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>کلیدهای عبور</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>{0} ایجاد شد</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>درخواست</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>شما نمی‌توانید برنامه کلید عبور را ویرایش کنید زیرا باعث بی اعتباری کلید عبور می‌شود</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>کلید عبور کپی نمی‌شود</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>کلید عبور در مورد شبیه سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه سازی این مورد ادامه دهید؟</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>درخواست را کپی کنید</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>برای ورود دو مرحله ای موجود است</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>راهنمای درخواست مجدد کلمه عبور اصلی</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>باز کردن قفل ممکن است به دلیل حافظه ناکافی انجام شود. تنظیمات حافظه KDF خود را کاهش دهید تا حل شود.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>کلید API نامعتبر</value>
@@ -2668,50 +2686,80 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>توکن API نامعتبر</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>این مورد را نمی‌توان با سازمان به اشتراک گذاشت زیرا قبلاً موردی با کلید عبور یکسان وجود دارد.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
+    <value>پر کردن خودکار را مسدود کنید</value>
  </data>
  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
+    <value>پر کردن خودکار برای این نشانی‌های اینترنتی ارائه نمی‌شود.</value>
  </data>
  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
+    <value>نشانی اینترنتی مسدود شده جدید</value>
  </data>
  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
+    <value>نشانی اینترنتی ذخیره شد</value>
  </data>
  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
+    <value>قالب نامعتبر است. از https://، http://، یا androidapp:// استفاده کنید</value>
    <comment>https://, http://, androidapp:// should not be translated</comment>
  </data>
  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
+    <value>ویرایش نشانی اینترنتی</value>
  </data>
  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
+    <value>ورود نشانی اینترنتی</value>
  </data>
  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
+    <value>قالب: {0}. چندین نشانی اینترنتی را با کاما جدا کنید.</value>
  </data>
  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
+    <value>قالب: {0}</value>
  </data>
  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
+    <value>نشانی اینترنتی نامعتبر</value>
  </data>
  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
+    <value>نشانی اینترنتی حذف شد</value>
  </data>
  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
+    <value>هیچ نشانی اینترنتی مسدود شده ای وجود ندارد</value>
  </data>
  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
+    <value>{0} نشانی اینترنتی قبلاً مسدود شده است</value>
  </data>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
+    <value>نمی‌توان چندین نشانی اینترنتی را همزمان ویرایش کرد</value>
+  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
  </data>
 </root>
--- a/src/App/Resources/AppResources.fi.resx
+++ b/src/App/Resources/AppResources.fi.resx
@@ -701,7 +701,7 @@
    <value>Synkronoi holvi nyt</value>
  </data>
  <data name="TouchID" xml:space="preserve">
-    <value>Touch ID</value>
+    <value>Touch ID:llä</value>
    <comment>What Apple calls their fingerprint reader.</comment>
  </data>
  <data name="TwoStepLogin" xml:space="preserve">
@@ -711,7 +711,7 @@
    <value>Kaksivaiheinen kirjautuminen parantaa tilisi suojausta vaatimalla kirjautumisen vahvistuksen salasanan lisäksi todennuslaitteen, ‑sovelluksen, tekstiviestin, puhelun tai sähköpostin avulla. Voit ottaa kaksivaiheisen kirjautumisen käyttöön bitwarden.com‑verkkoholvissa. Haluatko avata sen nyt?</value>
  </data>
  <data name="UnlockWith" xml:space="preserve">
-    <value>Avaustapa: {0}</value>
+    <value>Avaus {0}</value>
  </data>
  <data name="UnlockWithPIN" xml:space="preserve">
    <value>Avaus PIN-koodilla</value>
@@ -766,7 +766,7 @@
    <value>1. Valitse esteettömyysasetusten "Palvelut" -otsikon alta ”Bitwarden”.</value>
  </data>
  <data name="BitwardenAutofillServiceStep2" xml:space="preserve">
-    <value>2. Laita asetus päälle ja paina OK-painiketta hyväksyäksesi.</value>
+    <value>2. Kytke asetus käyttöön ja hyväksy painanalla "OK".</value>
  </data>
  <data name="Disabled" xml:space="preserve">
    <value>Poistettu käytöstä</value>
@@ -802,7 +802,7 @@
    <value>Mahdollisesti tunnistetut kohteet</value>
  </data>
  <data name="Search" xml:space="preserve">
-    <value>Hae</value>
+    <value>Etsi</value>
  </data>
  <data name="BitwardenAutofillServiceSearch" xml:space="preserve">
    <value>Etsit automaattisesti täytettävää kohdetta osoitteelle ”{0}”.</value>
@@ -860,7 +860,7 @@
    <comment>For 2FA</comment>
  </data>
  <data name="YubiKeyInstruction" xml:space="preserve">
-    <value>Jatka asettamalla YubiKey NEO -todenuslaite laitteen takapuolta vasten tai kytke YubiKey-todennuslaite laitteen USB-porttiin ja paina sen painiketta.</value>
+    <value>Jatka asettamalla YubiKey NEO -todennuslaite laitteen taustaa vasten tai kytke YubiKey-todennuslaite laitteen USB-porttiin ja paina sen painiketta.</value>
  </data>
  <data name="YubiKeyTitle" xml:space="preserve">
    <value>YubiKey-todennuslaite</value>
@@ -916,10 +916,10 @@ Koodi luetaan automaattisesti.</value>
    <value>Kopioi TOTP-todennuskoodi</value>
  </data>
  <data name="CopyTotpAutomaticallyDescription" xml:space="preserve">
-    <value>Jos kirjautumistieto sisältää kaksivaiheisen todennusmenetelmän avaimen, kopioidaan TOTP-todennuskoodi leikepöydälle kohteen automaattisen täytön yhteydessä.</value>
+    <value>TOTP-todennuskoodi kopioidaan automaattisesti leikepöydälle automaattisen täytön yhteydessä, jos kirjautumistieto sisältää kaksivaiheisen todennusmenetelmän avaimen.</value>
  </data>
  <data name="CopyTotpAutomatically" xml:space="preserve">
-    <value>Kopioi TOTP-koodi automaattisesti</value>
+    <value>TOTP-koodin kopiointi</value>
  </data>
  <data name="PremiumRequired" xml:space="preserve">
    <value>Käyttääksesi tätä toimintoa tarvitset Premium-jäsenyyden.</value>
@@ -1140,7 +1140,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Erääntymisaika</value>
  </data>
  <data name="ShowWebsiteIcons" xml:space="preserve">
-    <value>Näytä verkkosivustojen kuvakkeet</value>
+    <value>Näytä sivustokuvakkeet</value>
  </data>
  <data name="ShowWebsiteIconsDescription" xml:space="preserve">
    <value>Näytä tunnistettava kuva jokaiselle kirjautumistiedolle.</value>
@@ -1182,7 +1182,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Avaa "Automaattinen täyttö -palvelu" -asetukset</value>
  </data>
  <data name="FaceID" xml:space="preserve">
-    <value>Face ID</value>
+    <value>Face ID:llä</value>
    <comment>What Apple calls their facial recognition reader.</comment>
  </data>
  <data name="FaceIDDirection" xml:space="preserve">
@@ -1269,13 +1269,13 @@ Koodi luetaan automaattisesti.</value>
    <comment>An entity of multiple related people (ex. a team or business organization).</comment>
  </data>
  <data name="HoldYubikeyNearTop" xml:space="preserve">
-    <value>Pidä YubiKey-todenuslaittettasi lähellä laitteen yläosaa.</value>
+    <value>Pidä YubiKey-todennuslaittettasi lähellä laitteen yläosaa.</value>
  </data>
  <data name="TryAgain" xml:space="preserve">
    <value>Yritä uudelleen</value>
  </data>
  <data name="YubiKeyInstructionIos" xml:space="preserve">
-    <value>Jatka pitämällä YubiKey NEO -todenuslaitetta laitteen takapuolta vasten.</value>
+    <value>Jatka pitämällä YubiKey NEO -todennuslaitetta laitteen taustaa vasten.</value>
  </data>
  <data name="BitwardenAutofillAccessibilityServiceDescription2" xml:space="preserve">
    <value>Esteettömyyspalvelu voi olla hyödyllinen sellaisten sovellusten kanssa, jotka eivät tue tavallista automaattisen täytön palvelua.</value>
@@ -1381,7 +1381,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Ei näytettäviä kohteita.</value>
  </data>
  <data name="SearchCollection" xml:space="preserve">
-    <value>Hae kokoelmasta</value>
+    <value>Etsi kokoelmasta</value>
  </data>
  <data name="SearchFileSends" xml:space="preserve">
    <value>Etsi tiedosto-Sendeistä</value>
@@ -1556,7 +1556,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Oletusarvoinen tumma teema</value>
  </data>
  <data name="DefaultDarkThemeDescription" xml:space="preserve">
-    <value>Valitse Oletus (järjestelmä) -asetuksen oletusarvoinen tumma teema, jota käytetään laitteen tumman tilan ollessa käytössä.</value>
+    <value>Valitse "Oletus (järjestelmä)" -asetuksen oletusarvoinen tumma teema, jota käytetään laitteen tumman tilan ollessa käytössä.</value>
  </data>
  <data name="CopyNotes" xml:space="preserve">
    <value>Kopioi merkinnät</value>
@@ -1623,7 +1623,7 @@ Koodi luetaan automaattisesti.</value>
    <value>Biometrinen todennus</value>
  </data>
  <data name="Biometrics" xml:space="preserve">
-    <value>Biometria</value>
+    <value>biometrialla</value>
  </data>
  <data name="UseBiometricsToUnlock" xml:space="preserve">
    <value>Avaa biometrialla</value>
@@ -1734,7 +1734,7 @@ Koodi luetaan automaattisesti.</value>
    <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
  </data>
  <data name="SearchTrash" xml:space="preserve">
-    <value>Hae roskakorista</value>
+    <value>Etsi roskakorista</value>
    <comment>(action prompt) Label for the search text field when viewing the trash folder</comment>
  </data>
  <data name="DoYouReallyWantToPermanentlyDeleteCipher" xml:space="preserve">
@@ -1999,7 +1999,7 @@ Koodi luetaan automaattisesti.</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">
-    <value>Hae Sendeistä</value>
+    <value>Etsi Sendeistä</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="EditSend" xml:space="preserve">
@@ -2414,9 +2414,9 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
  <data name="Service" xml:space="preserve">
    <value>Palvelu</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2628,6 +2628,24 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Nykyinen pääsalasana</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Kirjautuminen onnistui!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Hyväksy muilta laitteiltasi</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Pyydä hyväksyntää ylläpidolta</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Hyväksy pääsalasanalla</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Poista käytöstä julkisilla laitteilla</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Muista tämä laite</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Suojausavain</value>
  </data>
@@ -2648,7 +2666,7 @@ Haluatko vaihtaa tähän tiliin?</value>
    <value>Suojausavainta ei kopioida</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Suojausavainta ei kopioida kloonattuun kohteeseen. Haluatko jatkaa kloonausta?</value>
+    <value>Suojausavain ei kopioidu kloonattuun kohteeseen. Haluatko jatkaa kloonausta?</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
    <value>Kopioi sovellus</value>
@@ -2668,6 +2686,24 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Virheellinen API-tunniste</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Hyväksyntää pyydetty ylläpidolta</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Pyyntösi on välitetty ylläpidollesi.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Saat ilmoituksen heti kun se on hyväksytty.</value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Ongelmia kirjautumisessa?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Kirjaudutaan tunnuksella {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Holvin aikakatkaisutoiminnoksi vaihdettiin uloskirjaus</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Kohdetta ei voida jakaa organisaatiolle, koska siellä on jo samaa suojausavainta käyttävä kohde.</value>
  </data>
@@ -2714,4 +2750,16 @@ Haluatko vaihtaa tähän tiliin?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Useita URI-osoitteita ei ole mahdollista muokata samanaikaisesti</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Kirjautuminen hyväksyttiin</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Laitteella kirjautuminen on määritettävä Bitwarden-sovelluksen asetuksista. Tarvitsetko eri vaihtoehdon?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Laitteella kirjautuminen</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Kirjaudutaan sijaintiin</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -2414,9 +2414,9 @@ pindutin ang Magdagdag ng TOTP para ligtas na mai-store ang key</value>
  <data name="Service" xml:space="preserve">
    <value>Serbisyo</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2628,6 +2628,24 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Gusto mo bang pumunta sa account na ito?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Gusto mo bang pumunta sa account na ito?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -2414,9 +2414,9 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2628,39 +2628,57 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Mot de passe principal actuel</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>Clé d'accès</value>
  </data>
  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>Clés d'accès</value>
  </data>
  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>Créée le {0}</value>
    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
  </data>
  <data name="Application" xml:space="preserve">
    <value>Application</value>
  </data>
  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>Vous ne pouvez modifier l'application associée à la clé d'accès car cela l'invaliderait</value>
  </data>
  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>La clé d'accès ne sera pas copiée</value>
  </data>
  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>L'entrée clonée ne contiendra pas la clé d'accès. Continuer quand même ?</value>
  </data>
  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>Copier l'application</value>
  </data>
  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>Disponible pour la validation en deux étapes</value>
  </data>
  <data name="MasterPasswordRePromptHelp" xml:space="preserve">
    <value>Aide sur la ressaisie du mot de passe principal</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Le déverrouillage peut échouer en raison d'une mémoire insuffisante. Diminuez les paramètres de mémoire KDF pour y remédier</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Clé API invalide</value>
@@ -2668,8 +2686,26 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Jeton API invalide</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>Cet élément ne peut pas être déplacé vers l'organisation, car celle-ci dispose déjà d'un élément avec la même clé d'accès.</value>
  </data>
  <data name="BlockAutoFill" xml:space="preserve">
    <value>Bloquer la saisie automatique</value>
@@ -2714,4 +2750,16 @@ Voulez-vous basculer vers ce compte ?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Impossible de modifier des URI multiples à la fois</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Connexion sur</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.gl.resx
+++ b/src/App/Resources/AppResources.gl.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.he.resx
+++ b/src/App/Resources/AppResources.he.resx
@@ -2416,9 +2416,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2508,7 +2508,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2630,6 +2630,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2662,7 +2680,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2670,6 +2688,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2716,4 +2752,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.hi.resx
+++ b/src/App/Resources/AppResources.hi.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>सेवा</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
+  <data name="AddyIo" xml:space="preserve">
    <value>एननऐडी</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>फायरफॉक्स रीले</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>चालू मुख्य पासवर्ड</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -2411,9 +2411,9 @@
  <data name="Service" xml:space="preserve">
    <value>Usluga</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2625,6 +2625,24 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2657,7 +2675,7 @@
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2665,6 +2683,24 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2711,4 +2747,16 @@
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.hu.resx
+++ b/src/App/Resources/AppResources.hu.resx
@@ -2412,9 +2412,9 @@ TOTP hozzáadása a kulcs biztonságos tárolásához lehetőséget.</value>
  <data name="Service" xml:space="preserve">
    <value>Szolgáltatás</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2626,6 +2626,24 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Jelenlegi mesterjelszó</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Megtörtént a bejelentkezés.</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Jóváhagyás másik eszközzel</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Adminisztrátori jóváhagyás kérés</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Jóváhagyás mesterjelszóval</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Kikapcsolás nyilvános eszközzel</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Eszköz megjegyzése</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Hozzáférési kulcs</value>
  </data>
@@ -2658,7 +2676,7 @@ Szeretnénk átváltani erre a fiókra?</value>
    <value>Mesterjelszó újbóli bekérés súgó</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>A feloldás meghiúsulhat, mert nincs elegendő memória. A megoldáshoz csökkentsül a KDF memóriabeállításait.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Érvénytelen API kulcs</value>
@@ -2666,6 +2684,24 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Érvénytelen API vezérjel</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Adminisztrátori jóváhagyás kérés történt</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>A kérés elküldésre került az adminisztrátornak.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>A jóváhagyás után értesítés érkezik.</value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Probléma van a bejelentkezéssel?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Bejelentkezés mint {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>A széf időkifutási művelete kijelentkezésre módosult.</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Ez az elem nem osztható meg a szervezettel, mert már van egy ugyanezzel a hozzáférési kulccsal.</value>
  </data>
@@ -2712,4 +2748,16 @@ Szeretnénk átváltani erre a fiókra?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Nem szerkeszthető több URI egyszerre.</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>A bejelentkezés jóváhagyásra került.</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Az eszközzel történő bejelentkezést be kell állítani a Bitwarden alkalmazás beállításaiban. Más opcióra van szükség?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Bejelentkezés eszközzel</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Bejelentkezés:</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.id.resx
+++ b/src/App/Resources/AppResources.id.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2505,7 +2505,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2627,6 +2627,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2667,6 +2685,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.it.resx
+++ b/src/App/Resources/AppResources.it.resx
@@ -172,7 +172,7 @@
    <comment>Message shown when interacting with the server</comment>
  </data>
  <data name="DoYouReallyWantToDelete" xml:space="preserve">
-    <value>Vuoi davvero eliminarlo? Non lo potrai ripristinare.</value>
+    <value>Vuoi davvero eliminarlo? Questa operazione non può essere annullata.</value>
    <comment>Confirmation alert message when deleteing something.</comment>
  </data>
  <data name="Edit" xml:space="preserve">
@@ -477,7 +477,7 @@
    <value>Inserisci l'indirizzo email del tuo account per ricevere il suggerimento per la password principale.</value>
  </data>
  <data name="ExntesionReenable" xml:space="preserve">
-    <value>Riabilita l'estensione app</value>
+    <value>Riattiva l'estensione app</value>
  </data>
  <data name="ExtensionAlmostDone" xml:space="preserve">
    <value>Quasi fatto!</value>
@@ -2413,9 +2413,9 @@ clicca Aggiungi TOTP per salvare la chiave in modo sicuro</value>
  <data name="Service" xml:space="preserve">
    <value>Servizio</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>FirefoxRelay</value>
@@ -2505,7 +2505,7 @@ Vuoi passare a questo account?</value>
    <value>Accedi con dispositivo</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Login avviato</value>
+    <value>Accesso avviato</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>Una notifica è stata inviata al tuo dispositivo.</value>
@@ -2627,6 +2627,24 @@ Vuoi passare a questo account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Password principale corrente</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Accesso effettuato!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approva con un altro mio dispositivo</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Richiedi approvazione dell'amministratore</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approva con password principale</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Deseleziona se stai usando un dispositivo pubblico</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Ricorda questo dispositivo</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Vuoi passare a questo account?</value>
    <value>Aiuto per chiedere la password principale di nuovo</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Lo sblocco potrebbe non riuscire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF per risolvere il problema.</value>
+    <value>Lo sblocco potrebbe non riuscire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF o imposta lo sbocco biometrico per risolvere il problema.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Chiave API non valida</value>
@@ -2667,6 +2685,24 @@ Vuoi passare a questo account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Token API non valido</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Approvazione dell'amministratore richiesta</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>La tua richiesta è stata inviata al tuo amministratore.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Riceverai una notifica una volta approvato. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Problemi ad accedere?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Accedendo come {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Azione timeout cassaforte impostata su uscire</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Questo elemento non può essere condiviso con l'organizzazione perché ne esiste già uno con la stessa passkey.</value>
  </data>
@@ -2683,7 +2719,7 @@ Vuoi passare a questo account?</value>
    <value>URI salvato</value>
  </data>
  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Formato non valido. Usa https://, http://, or androidapp://</value>
+    <value>Formato non valido. Usa https://, http://, o androidapp://</value>
    <comment>https://, http://, androidapp:// should not be translated</comment>
  </data>
  <data name="EditURI" xml:space="preserve">
@@ -2713,4 +2749,16 @@ Vuoi passare a questo account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Non puoi modificare più URI contemporaneamente</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Accesso approvato</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>L'accesso con dispositivo deve essere abilitato nelle impostazioni dell'app Bitwarden. Ti serve un'altra opzione?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Accedi con dispositivo</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Accedendo su</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ja.resx
+++ b/src/App/Resources/AppResources.ja.resx
@@ -2413,9 +2413,9 @@
  <data name="Service" xml:space="preserve">
    <value>サービス</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2627,6 +2627,24 @@
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>現在のマスターパスワード</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>ログインしました!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>他のデバイスで承認する</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>管理者の承認を要求する</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>マスターパスワードで承認する</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>パブリックデバイスを使用してオフにする</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>このデバイスを記憶する</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>パスキー</value>
  </data>
@@ -2659,7 +2677,7 @@
    <value>マスターパスワードの再プロンプトヘルプ</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>メモリ不足のためロック解除に失敗することがあります。KDF のメモリ設定を減らして解決してください</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>無効な API キー</value>
@@ -2667,6 +2685,24 @@
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>無効な API トークン</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>管理者の承認を要求しました</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>要求が管理者に送信されました。</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>承認されると通知されます。 </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>ログインできない場合</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>{0} としてログイン中</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>保管庫のタイムアウトアクションがログアウトに変更されました</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>すでに同じパスキーを持つものがあるため、このアイテムは組織と共有することはできません。</value>
  </data>
@@ -2713,4 +2749,16 @@
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>一度に複数の URI を編集することはできません</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>ログインの承認</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Bitwarden アプリで「デバイスでログイン」の設定をする必要があります。別のオプションが必要ですか？</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>デバイスでログイン</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>ログイン先</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ka.resx
+++ b/src/App/Resources/AppResources.ka.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.kn.resx
+++ b/src/App/Resources/AppResources.kn.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -2413,9 +2413,9 @@
  <data name="Service" xml:space="preserve">
    <value>서비스</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2505,7 +2505,7 @@ Do you want to switch to this account?</value>
    <value>기기로 로그인</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>기기에 알림이 전송되었습니다.</value>
@@ -2627,6 +2627,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2667,6 +2685,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.lt.resx
+++ b/src/App/Resources/AppResources.lt.resx
@@ -2414,9 +2414,9 @@ pasirinkite Pridėti TOTP, kad raktas būtų saugiai išsaugotas</value>
  <data name="Service" xml:space="preserve">
    <value>Paslauga</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2628,6 +2628,24 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Dabartinis pagrindinis slaptažodis</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Ar norite pereiti prie šios paskyros?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Ar norite pereiti prie šios paskyros?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.lv.resx
+++ b/src/App/Resources/AppResources.lv.resx
@@ -1384,10 +1384,10 @@ Nolasīšana notiks automātiski.</value>
    <value>Meklēt krājumā</value>
  </data>
  <data name="SearchFileSends" xml:space="preserve">
-    <value>Meklēt datņu Sūtījumus</value>
+    <value>Meklēt datņu Send</value>
  </data>
  <data name="SearchTextSends" xml:space="preserve">
-    <value>Meklēt teksta Sūtījumus</value>
+    <value>Meklēt teksta Send</value>
  </data>
  <data name="SearchGroup" xml:space="preserve">
    <value>Meklēt {0}</value>
@@ -1496,13 +1496,13 @@ Nolasīšana notiks automātiski.</value>
    <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
  </data>
  <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>Glabātava ir slēgta. Nepieciešams norādīt galveno paroli, lai turpinātu.</value>
+    <value>Glabātava ir aizslēgta. Nepieciešams norādīt galveno paroli, lai turpinātu.</value>
  </data>
  <data name="VaultLockedPIN" xml:space="preserve">
-    <value>Glabātava ir slēgta. Nepieciešams norādīt PIN kodu, lai turpinātu.</value>
+    <value>Glabātava ir aizslēgta. Nepieciešams norādīt PIN kodu, lai turpinātu.</value>
  </data>
  <data name="VaultLockedIdentity" xml:space="preserve">
-    <value>Glabātava ir slēgta. Jāapstiprina identitāte, lai turpinātu.</value>
+    <value>Glabātava ir aizslēgta. Jāapstiprina identitāte, lai turpinātu.</value>
  </data>
  <data name="Dark" xml:space="preserve">
    <value>Tumšs</value>
@@ -1662,7 +1662,7 @@ Nolasīšana notiks automātiski.</value>
    <value>Kods nosūtīts</value>
  </data>
  <data name="ConfirmYourIdentity" xml:space="preserve">
-    <value>Lai turpinātu, apstipriniet savu identitāti.</value>
+    <value>Jāapstiprina identitāte, lai turpinātu.</value>
  </data>
  <data name="ExportVaultWarning" xml:space="preserve">
    <value>Šī izguve satur glabātavas datus nešifrētā veidā. Izdoto datni nevajadzētu glabāt vai sūtīt nedrošos veidos (piemēram, e-pastā). Izdzēst to uzreiz pēc izmantošanas.</value>
@@ -1746,7 +1746,7 @@ Nolasīšana notiks automātiski.</value>
    <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
  </data>
  <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
-    <value>Vai tiešām vēlaties sūtīt uz atkritni?</value>
+    <value>Vai tiešām pārvietot uz atkritni?</value>
    <comment>Confirmation alert message when soft-deleting a cipher.</comment>
  </data>
  <data name="AccountBiometricInvalidated" xml:space="preserve">
@@ -1813,7 +1813,7 @@ Nolasīšana notiks automātiski.</value>
    <value>Ieslēdzot šo slēdzi, Tu piekrīti sekojošajam:</value>
  </data>
  <data name="AcceptPoliciesError" xml:space="preserve">
-    <value>Nav pieņemti izmantošanas nosacījumi un privātuma politika.</value>
+    <value>Nav apstiprināti izmantošanas noteikumi un privātuma nosacījumi.</value>
  </data>
  <data name="TermsOfService" xml:space="preserve">
    <value>Izmantošanas nosacījumi</value>
@@ -1867,19 +1867,19 @@ Nolasīšana notiks automātiski.</value>
    <value>Apvienības nosacījumi ietekmē Tavas īpašumtiesību iespējas.</value>
  </data>
  <data name="Send" xml:space="preserve">
-    <value>Sūtīt</value>
+    <value>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="AllSends" xml:space="preserve">
-    <value>Visi Sūtījumi</value>
+    <value>Visi 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="Sends" xml:space="preserve">
-    <value>Sūtījumi</value>
+    <value>Send vienumi</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="NameInfo" xml:space="preserve">
-    <value>Draudzīgs nosaukums, lai raksturotu šo Sūtījumu.</value>
+    <value>Lasāms nosaukums, kas apraksta šo 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="Text" xml:space="preserve">
@@ -1920,7 +1920,7 @@ Nolasīšana notiks automātiski.</value>
    <value>Dzēšanas laiks</value>
  </data>
  <data name="DeletionDateInfo" xml:space="preserve">
-    <value>Sūtījums tiks neatgriezeniski dzēsts norādītajā datumā un laikā.</value>
+    <value>Send tiks neatgriezeniski izdzēsts norādītajā datumā un laikā.</value>
    <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">
@@ -1933,21 +1933,21 @@ Nolasīšana notiks automātiski.</value>
    <value>Derīguma beigu laiks</value>
  </data>
  <data name="ExpirationDateInfo" xml:space="preserve">
-    <value>Ja tas ir iestatīts, piekļuve šim Sūtījumam beigsies norādītajā datumā un laikā.</value>
+    <value>Ja iestatīts, piekļuve šim Send beigsies norādītajā datumā un laikā.</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="Expired" xml:space="preserve">
    <value>Beidzies izmantošanas laiks</value>
  </data>
  <data name="MaximumAccessCount" xml:space="preserve">
-    <value>Lielākais pieļaujamais piekļuvju skaits</value>
+    <value>Lielākais pieļaujamais piekļuves reižu skaits</value>
  </data>
  <data name="MaximumAccessCountInfo" xml:space="preserve">
-    <value>Ja tas ir iestatīts, lietotāji vairs nevarēs piekļūt šim Sūtījumam, tiklīdz būs sasniegts maksimālais piekļuves skaits.</value>
+    <value>Ja iestatīts, lietotāji nevarēs piekļūt šim Send, kad tiks sasniegts lielākais pieļaujamais piekļūšanas reižu skaits.</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">
-    <value>Sasniegts lielākais pieļaujamais piekļuvju skaits</value>
+    <value>Sasniegts lielākais pieļaujamais piekļuves reižu skaits</value>
  </data>
  <data name="CurrentAccessCount" xml:space="preserve">
    <value>Pašreizējais piekļuvju skaits</value>
@@ -1956,14 +1956,14 @@ Nolasīšana notiks automātiski.</value>
    <value>Jauna parole</value>
  </data>
  <data name="PasswordInfo" xml:space="preserve">
-    <value>Pēc izvēles pieprasīt paroli, lai lietotāji varētu piekļūt šim Sūtījumam.</value>
+    <value>Pēc izvēles pieprasīt paroli, lai lietotāji varētu piekļūt šim 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="RemovePassword" xml:space="preserve">
    <value>Noņemt paroli</value>
  </data>
  <data name="AreYouSureRemoveSendPassword" xml:space="preserve">
-    <value>Vai tiešām vēlaties noņemt paroli?</value>
+    <value>Vai tiešām noņemt paroli?</value>
  </data>
  <data name="RemovingSendPassword" xml:space="preserve">
    <value>Noņem paroli</value>
@@ -1972,19 +1972,19 @@ Nolasīšana notiks automātiski.</value>
    <value>Parole ir noņemta</value>
  </data>
  <data name="NotesInfo" xml:space="preserve">
-    <value>Privātas piezīmes par šo Sūtījumu.</value>
+    <value>Personīgas piezīmes par šo 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="DisableSend" xml:space="preserve">
-    <value>Deaktivizēt šo Sūtījumu, lai neviens tam nevarētu piekļūt</value>
+    <value>Izslēgt šo Send, lai neviens tam nevarētu piekļūt</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="NoSends" xml:space="preserve">
-    <value>Jūsu kontā nav neviena Sūtījuma.</value>
+    <value>Kontā nav neviena 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="AddASend" xml:space="preserve">
-    <value>Pievienot Sūtījumu</value>
+    <value>Pievienot 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="CopyLink" xml:space="preserve">
@@ -1994,35 +1994,35 @@ Nolasīšana notiks automātiski.</value>
    <value>Kopīgot saiti</value>
  </data>
  <data name="SendLink" xml:space="preserve">
-    <value>Sūtījuma saite</value>
+    <value>Send saite</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">
-    <value>Meklēt Sūtījumus</value>
+    <value>Meklēt 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="EditSend" xml:space="preserve">
-    <value>Labot Sūtījumu</value>
+    <value>Labot 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="AddSend" xml:space="preserve">
-    <value>Jauns Sūtījums</value>
+    <value>Jauns 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="AreYouSureDeleteSend" xml:space="preserve">
-    <value>Vai tiešām vēlaties dzēst šo Sūtījumu?</value>
+    <value>Vai tiešām izdzēst šo 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="SendDeleted" xml:space="preserve">
-    <value>Sūtījums dzēsts</value>
+    <value>Send izdzēsts</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SendUpdated" xml:space="preserve">
-    <value>Sūtījums saglabāts</value>
+    <value>Send saglabāts</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="NewSendCreated" xml:space="preserve">
-    <value>Sūtījums izveidots</value>
+    <value>Send izveidots</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">
@@ -2044,30 +2044,30 @@ Nolasīšana notiks automātiski.</value>
    <value>Pielāgots</value>
  </data>
  <data name="ShareOnSave" xml:space="preserve">
-    <value>Kopīgojiet šo Sūtījumu pēc saglabāšanas</value>
+    <value>Kopīgot šo Send pēc saglabāšanas</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="SendDisabledWarning" xml:space="preserve">
-    <value>Organizācijas politikas dēļ jūs varat dzēst tikai esošu Sūtījumu.</value>
+    <value>Uzņēmuma nosacījumu dēļ ir iespējams dzēst tikai esošu 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="AboutSend" xml:space="preserve">
-    <value>Par Sūtījumu</value>
+    <value>Par 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="HideEmail" xml:space="preserve">
    <value>Slēpt e-pasta adresi no saņēmējiem.</value>
  </data>
  <data name="SendOptionsPolicyInEffect" xml:space="preserve">
-    <value>Viena vai vairākas organizācijas politikas ietekmē jūsu Sūtījuma opcijas.</value>
+    <value>Viens vai vairāki apvienības nosacījumi ietekmē Send iespējas.</value>
    <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>Bezmaksas kontos var kopīgot tikai tekstu. Lai izmantotu failus ar Sūtījumu, ir nepieciešama Premium dalība.</value>
+    <value>Ar bezmaksas kontu ir iespējams kopīgot tikai tekstu. Ir nepieciešama Premium dalība, lai Send izmantotu datnes.</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">
-    <value>Jums ir jāapstiprina savs e-pasts, lai izmantotu failus ar Sūtījumu. Jūs varat verificēt savu e-pastu tīmekļa glabātuvē.</value>
+    <value>Ir jāapstiprina e-pasta adrese, lai izmantotu datnes ar Send. E-pasta edresi var apstiprināt tīmekļa glabātavā.</value>
    <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">
@@ -2203,7 +2203,7 @@ Nolasīšana notiks automātiski.</value>
    <value>Sūta</value>
  </data>
  <data name="CopySendLinkOnSave" xml:space="preserve">
-    <value>Kopēt Sūtījuma saiti saglabāšanas laikā</value>
+    <value>Saglabāšanas laikā ievietot Send saiti starpliktuvē</value>
  </data>
  <data name="SendingCode" xml:space="preserve">
    <value>Sūta kodu</value>
@@ -2212,13 +2212,13 @@ Nolasīšana notiks automātiski.</value>
    <value>Pārbauda</value>
  </data>
  <data name="ResendCode" xml:space="preserve">
-    <value>Nosūtīt kodu vēlreiz</value>
+    <value>Atkārtoti nosūtīt kodu</value>
  </data>
  <data name="AVerificationCodeWasSentToYourEmail" xml:space="preserve">
    <value>Pārbaudes kods tika nosūtīts e-pastā</value>
  </data>
  <data name="AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPleaseTryAgain" xml:space="preserve">
-    <value>Nosūtot verifikācijas kodu uz jūsu e-pastu, radās kļūda. Lūdzu mēģiniet vēlreiz</value>
+    <value>Atgadījās kļūda, kad apliecinājuma kods tika sūtīts uz e-pastu. Lūgums mēģināt vēlreiz</value>
  </data>
  <data name="EnterTheVerificationCodeThatWasSentToYourEmail" xml:space="preserve">
    <value>Ievadīt pārbaudes kodu, kas tika nosūtīts e-pastā</value>
@@ -2413,9 +2413,9 @@ jāizvēlas "Pievienot TOTP", lai droši glabātu atslēgu.</value>
  <data name="Service" xml:space="preserve">
    <value>Pakalpojums</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2511,7 +2511,7 @@ Vai pārslēgties uz šo kontu?</value>
    <value>Uz ierīci ir nosūtīts paziņojums.</value>
  </data>
  <data name="PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice" xml:space="preserve">
-    <value>Jāpārliecinās, ka glabātava ir atslēgta un atpazīšanas vārdkopa ir tāda pati arī citā ierīcē.</value>
+    <value>Lūgums pārliecināties, ka glabātava ir atslēgta un atpazīšanas vārdkopa ir tāda pati arī citā ierīcē.</value>
  </data>
  <data name="ResendNotification" xml:space="preserve">
    <value>Atkārtoti nosūtīt paziņojumu</value>
@@ -2627,6 +2627,24 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Pašreizējā galvenā parole</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Pieteicies.</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Apstiprināt ar citu savu ierīci</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Pieprasīt pārvaldītāja apstiprinājumu</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Apstiprināt ar galveno paroli</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Izslēgt izmantojot publisku ierīci</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Atcerēties šo ierīci</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Paroļatslēga</value>
  </data>
@@ -2659,7 +2677,7 @@ Vai pārslēgties uz šo kontu?</value>
    <value>Galvenās paroles pārvaicāšanas palīdzība</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Atslēgšana var neizdoties nepietiekamas atmiņas dēļ. Lai to novērstu, jāsamazina KDF atmiņas iestatījmi</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Nederīga API atslēga</value>
@@ -2667,6 +2685,24 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Nederīga API pilnvara</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Pieprasīts pārvaldītāja apstiprinājums</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Pieprasījums tika nosūtīts pārvaldītājam.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>Tiks saņemts paziņojums, tiklīdz būs apstiprināts. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Neizdodas pieteikties?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Piesakās kā {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Glabātavas noildzes darbība nomainīta uz atteikšanos</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>Šo vienumu nevar kopīgot ar apvienību, jo tur jau ir tāds ar to pašu paroļatslēgu.</value>
  </data>
@@ -2713,4 +2749,16 @@ Vai pārslēgties uz šo kontu?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Nevar labot vairākus URI vienlaicīgi</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Pieteikšanās apstiprināta</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Ir jāuzstāda pieteikšanās ar ierīci Bitwarden lietotnes iestatījumos. Nepieciešama cita iespēja?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Pieteikties ar ierīci</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Piesakās</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.ml.resx
+++ b/src/App/Resources/AppResources.ml.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2505,7 +2505,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2627,6 +2627,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2659,7 +2677,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2667,6 +2685,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2713,4 +2749,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.mr.resx
+++ b/src/App/Resources/AppResources.mr.resx
@@ -514,7 +514,7 @@
    <value>अंगुलिमुद्रा</value>
  </data>
  <data name="GeneratePassword" xml:space="preserve">
-    <value>Generate password</value>
+    <value>पासवर्ड निर्माण करा</value>
  </data>
  <data name="GetPasswordHint" xml:space="preserve">
    <value>Get your master password hint</value>
@@ -587,11 +587,11 @@
    <value>Master password must be at least {0} characters long.</value>
  </data>
  <data name="MinNumbers" xml:space="preserve">
-    <value>Minimum numbers</value>
+    <value>किमान अंक</value>
    <comment>Minimum numeric characters for password generator settings</comment>
  </data>
  <data name="MinSpecial" xml:space="preserve">
-    <value>Minimum special</value>
+    <value>किमान विशेष</value>
    <comment>Minimum special characters for password generator settings</comment>
  </data>
  <data name="MoreSettings" xml:space="preserve">
@@ -632,10 +632,10 @@
    <value>Other</value>
  </data>
  <data name="PasswordGenerated" xml:space="preserve">
-    <value>Password generated</value>
+    <value>पासवर्ड निर्माण झाला</value>
  </data>
  <data name="PasswordGenerator" xml:space="preserve">
-    <value>Password generator</value>
+    <value>पासवर्ड जनित्र</value>
  </data>
  <data name="PasswordHint" xml:space="preserve">
    <value>Password hint</value>
@@ -657,7 +657,7 @@
    <value>Please consider helping us out with a good review!</value>
  </data>
  <data name="RegeneratePassword" xml:space="preserve">
-    <value>Regenerate password</value>
+    <value>पासवर्ड पुनर्जनित करा</value>
  </data>
  <data name="RetypeMasterPassword" xml:space="preserve">
    <value>Re-type master password</value>
@@ -1008,16 +1008,16 @@ Scanning will happen automatically.</value>
    <value>Security code</value>
  </data>
  <data name="TypeCard" xml:space="preserve">
-    <value>Card</value>
+    <value>कार्ड</value>
  </data>
  <data name="TypeIdentity" xml:space="preserve">
-    <value>Identity</value>
+    <value>ओळख</value>
  </data>
  <data name="TypeLogin" xml:space="preserve">
-    <value>Login</value>
+    <value>प्रवेश</value>
  </data>
  <data name="TypeSecureNote" xml:space="preserve">
-    <value>Secure note</value>
+    <value>संरक्षित चिठ्ठी</value>
  </data>
  <data name="Address1" xml:space="preserve">
    <value>Address 1</value>
@@ -1038,7 +1038,7 @@ Scanning will happen automatically.</value>
    <value>Brand</value>
  </data>
  <data name="CardholderName" xml:space="preserve">
-    <value>Cardholder name</value>
+    <value>कार्डधारकाचे नाव</value>
  </data>
  <data name="CityTown" xml:space="preserve">
    <value>City / Town</value>
@@ -1158,16 +1158,16 @@ Scanning will happen automatically.</value>
    <value>Go to my vault</value>
  </data>
  <data name="Collections" xml:space="preserve">
-    <value>Collections</value>
+    <value>संग्रह</value>
  </data>
  <data name="NoItemsCollection" xml:space="preserve">
-    <value>There are no items in this collection.</value>
+    <value>ह्या संग्रहात एकही वस्तू नाही.</value>
  </data>
  <data name="NoItemsFolder" xml:space="preserve">
    <value>There are no items in this folder.</value>
  </data>
  <data name="NoItemsTrash" xml:space="preserve">
-    <value>There are no items in the trash.</value>
+    <value>कचराकुंडी रिकामी आहे.</value>
  </data>
  <data name="AutofillAccessibilityService" xml:space="preserve">
    <value>Auto-fill Accessibility Service</value>
@@ -1331,7 +1331,7 @@ Scanning will happen automatically.</value>
    <value>Invalid email address.</value>
  </data>
  <data name="Cards" xml:space="preserve">
-    <value>Cards</value>
+    <value>कार्ड</value>
  </data>
  <data name="Identities" xml:space="preserve">
    <value>Identities</value>
@@ -1340,7 +1340,7 @@ Scanning will happen automatically.</value>
    <value>Logins</value>
  </data>
  <data name="SecureNotes" xml:space="preserve">
-    <value>Secure notes</value>
+    <value>संरक्षित चिठ्ठ्या</value>
  </data>
  <data name="AllItems" xml:space="preserve">
    <value>All items</value>
@@ -1372,7 +1372,7 @@ Scanning will happen automatically.</value>
    <value>Password history</value>
  </data>
  <data name="Types" xml:space="preserve">
-    <value>Types</value>
+    <value>प्रकार</value>
  </data>
  <data name="NoPasswordsToList" xml:space="preserve">
    <value>No passwords to list.</value>
@@ -1381,7 +1381,7 @@ Scanning will happen automatically.</value>
    <value>There are no items to list.</value>
  </data>
  <data name="SearchCollection" xml:space="preserve">
-    <value>Search collection</value>
+    <value>संग्रहात शोधा</value>
  </data>
  <data name="SearchFileSends" xml:space="preserve">
    <value>Search file Sends</value>
@@ -1422,7 +1422,7 @@ Scanning will happen automatically.</value>
    <value>Item has been shared.</value>
  </data>
  <data name="SelectOneCollection" xml:space="preserve">
-    <value>You must select at least one collection.</value>
+    <value>किमान एक संग्रह तरी निवडला पाहिजे.</value>
  </data>
  <data name="Share" xml:space="preserve">
    <value>Share</value>
@@ -1440,7 +1440,7 @@ 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>Number of words</value>
+    <value>शब्दांची संख्या</value>
  </data>
  <data name="Passphrase" xml:space="preserve">
    <value>Passphrase</value>
@@ -1453,7 +1453,7 @@ Scanning will happen automatically.</value>
    <comment>To clear something out. example: To clear browser history.</comment>
  </data>
  <data name="Generator" xml:space="preserve">
-    <value>Generator</value>
+    <value>जनित्र</value>
    <comment>Short for "Password Generator"</comment>
  </data>
  <data name="NoFoldersToList" xml:space="preserve">
@@ -1601,11 +1601,11 @@ Scanning will happen automatically.</value>
    <value>Your theme changes will apply when the app is restarted.</value>
  </data>
  <data name="Capitalize" xml:space="preserve">
-    <value>Capitalize</value>
+    <value>पहिले अक्षर मोठे करा</value>
    <comment>ex. Uppercase the first character of a word.</comment>
  </data>
  <data name="IncludeNumber" xml:space="preserve">
-    <value>Include number</value>
+    <value>अंक समविष्ट करा</value>
  </data>
  <data name="Download" xml:space="preserve">
    <value>Download</value>
@@ -1684,7 +1684,7 @@ Scanning will happen automatically.</value>
    <value>There was a problem exporting your vault.  If the problem persists, you'll need to export from the web vault.</value>
  </data>
  <data name="ExportVaultSuccess" xml:space="preserve">
-    <value>Vault exported successfully</value>
+    <value>तिजोरी निर्यात यशस्वी</value>
  </data>
  <data name="Clone" xml:space="preserve">
    <value>Clone</value>
@@ -1730,7 +1730,7 @@ Scanning will happen automatically.</value>
    <comment>Confirmation message after successfully restoring a soft-deleted item</comment>
  </data>
  <data name="Trash" xml:space="preserve">
-    <value>Trash</value>
+    <value>कचराकुंडी</value>
    <comment>(noun) Location of deleted items which have not yet been permanently deleted</comment>
  </data>
  <data name="SearchTrash" xml:space="preserve">
@@ -1868,15 +1868,15 @@ Scanning will happen automatically.</value>
    <value>An organization policy is affecting your ownership options.</value>
  </data>
  <data name="Send" xml:space="preserve">
-    <value>Send</value>
+    <value>पाठवणी</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">
-    <value>All Sends</value>
+    <value>सर्व पाठवण्या</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="Sends" xml:space="preserve">
-    <value>Sends</value>
+    <value>पाठवण्या</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="NameInfo" xml:space="preserve">
@@ -1985,7 +1985,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="AddASend" xml:space="preserve">
-    <value>Add a Send</value>
+    <value>पाठवणी जोडा</value>
    <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
  </data>
  <data name="CopyLink" xml:space="preserve">
@@ -2261,10 +2261,10 @@ Scanning will happen automatically.</value>
    <value>Filter items by vault</value>
  </data>
  <data name="AllVaults" xml:space="preserve">
-    <value>All vaults</value>
+    <value>सर्व तिजोऱ्या</value>
  </data>
  <data name="Vaults" xml:space="preserve">
-    <value>Vaults</value>
+    <value>तिजोऱ्या</value>
  </data>
  <data name="VaultFilterDescription" xml:space="preserve">
    <value>Vault: {0}</value>
@@ -2385,7 +2385,7 @@ select Add TOTP to store the key safely</value>
    <value>Password type</value>
  </data>
  <data name="WhatWouldYouLikeToGenerate" xml:space="preserve">
-    <value>What would you like to generate?</value>
+    <value>काय निर्माण करायचे?</value>
  </data>
  <data name="UsernameType" xml:space="preserve">
    <value>Username type</value>
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2441,7 +2441,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>Generate username</value>
+    <value>वापरकर्ता नाव निर्माण करा</value>
  </data>
  <data name="EmailType" xml:space="preserve">
    <value>Email Type</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/src/App/Resources/AppResources.my.resx
+++ b/src/App/Resources/AppResources.my.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
  <data name="Service" xml:space="preserve">
    <value>Service</value>
  </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
  </data>
  <data name="FirefoxRelay" xml:space="preserve">
    <value>Firefox Relay</value>
@@ -2506,7 +2506,7 @@ Do you want to switch to this account?</value>
    <value>Log in with device</value>
  </data>
  <data name="LogInInitiated" xml:space="preserve">
-    <value>Log in initiated</value>
+    <value>Login initiated</value>
  </data>
  <data name="ANotificationHasBeenSentToYourDevice" xml:space="preserve">
    <value>A notification has been sent to your device.</value>
@@ -2628,6 +2628,24 @@ Do you want to switch to this account?</value>
  <data name="CurrentMasterPassword" xml:space="preserve">
    <value>Current master password</value>
  </data>
+  <data name="LoggedIn" xml:space="preserve">
+    <value>Logged in!</value>
+  </data>
+  <data name="ApproveWithMyOtherDevice" xml:space="preserve">
+    <value>Approve with my other device</value>
+  </data>
+  <data name="RequestAdminApproval" xml:space="preserve">
+    <value>Request admin approval</value>
+  </data>
+  <data name="ApproveWithMasterPassword" xml:space="preserve">
+    <value>Approve with master password</value>
+  </data>
+  <data name="TurnOffUsingPublicDevice" xml:space="preserve">
+    <value>Turn off using a public device</value>
+  </data>
+  <data name="RememberThisDevice" xml:space="preserve">
+    <value>Remember this device</value>
+  </data>
  <data name="Passkey" xml:space="preserve">
    <value>Passkey</value>
  </data>
@@ -2660,7 +2678,7 @@ Do you want to switch to this account?</value>
    <value>Master password re-prompt help</value>
  </data>
  <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
  </data>
  <data name="InvalidAPIKey" xml:space="preserve">
    <value>Invalid API key</value>
@@ -2668,6 +2686,24 @@ Do you want to switch to this account?</value>
  <data name="InvalidAPIToken" xml:space="preserve">
    <value>Invalid API token</value>
  </data>
+  <data name="AdminApprovalRequested" xml:space="preserve">
+    <value>Admin approval requested</value>
+  </data>
+  <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
+    <value>Your request has been sent to your admin.</value>
+  </data>
+  <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
+    <value>You will be notified once approved. </value>
+  </data>
+  <data name="TroubleLoggingIn" xml:space="preserve">
+    <value>Trouble logging in?</value>
+  </data>
+  <data name="LoggingInAsX" xml:space="preserve">
+    <value>Logging in as {0}</value>
+  </data>
+  <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
+    <value>Vault timeout action changed to log out</value>
+  </data>
  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
  </data>
@@ -2714,4 +2750,16 @@ Do you want to switch to this account?</value>
  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
    <value>Cannot edit multiple URIs at once</value>
  </data>
+  <data name="LoginApproved" xml:space="preserve">
+    <value>Login approved</value>
+  </data>
+  <data name="LogInWithDeviceMustBeSetUpInTheSettingsOfTheBitwardenAppNeedAnotherOption" xml:space="preserve">
+    <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
+  </data>
+  <data name="LogInWithDevice" xml:space="preserve">
+    <value>Log in with device</value>
+  </data>
+  <data name="LoggingInOn" xml:space="preserve">
+    <value>Logging in on</value>
+  </data>
 </root>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
André Bispo	2dd6a3f294	[PM-3340] Change settings screen vault timeout action cell UI.	2023-09-13 17:28:03 +01:00
André Bispo	3e2005e5ed	[PM-3606] TDE user with 2FA isn't able to autofill on iOS (#2723 ) * [PM-3606] Fix 2FA for autofill * [PM-3606] Fix autofill when user doesn't have a login method available. * [PM-3606] PR fixes * [PM-3606] Add logout logic to other extension projects * [PM-3606] Move code to base class. * Transform into property instead of field Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * Remove double ";" Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3606] Fix iOS extension by changing base class of LockPasswordViewController --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>	2023-09-09 17:38:14 -04:00
Will Browning	382eee2ed3	[PM-3556] Change anonaddy to addy io (#2711 ) * Update AppResources.af.resx * Update AnonAddy references * Reverted AnonAddy to AddyIo refactor, keeping text and url changes --------- Co-authored-by: Andre Rosado <arosado@bitwarden.com>	2023-09-08 15:23:51 +01:00
github-actions[bot]	b0f1dd00ee	Autosync the updated translations (#2751 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-09-08 09:33:37 +00:00
André Bispo	5961a001ab	[PM-3551] Expired SSO token cached (#2718 )	2023-09-08 07:48:37 +01:00
André Bispo	9026dd10e5	[PM-3593] Fix enable biometric on autofill when there is not MP (#2717 )	2023-09-07 16:30:46 +01:00
ifernandezdiaz	355261679d	Adding missing IDs for Set Password and Update Password pages (#2748 )	2023-09-07 11:24:48 -03:00
ifernandezdiaz	7f14ec9b5d	QA-508 - Build app for automation CI (#2705 ) * Adding build steps for .app * Uploading .app artifact * Fixing ARCHIVE_PATH variable * Fixing missing OutputPath * Fixing Bitwarden .app file name * Fixing wrong .app location * Adding Fede's suggestion * Update .github/workflows/build.yml Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> --------- Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>	2023-09-06 14:25:59 -03:00
Opeyemi	0c72626916	UPDATE: all workflows (#2743 )	2023-09-06 15:30:47 +01:00
André Bispo	f21fae7fea	[PM-3382] User cannot select Email as a secondary 2FA option following SSO (#2719 ) * [PM-3382] Update mobile client to receive and use SsoEmail2faSessionToken * [PM-3382] Fix null 2fa email with local email on MP login.	2023-09-06 10:26:11 +01:00
github-actions[bot]	6d4792bc24	Autosync the updated translations (#2741 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-09-01 12:46:27 +00:00
mpbw2	dbadf8c56f	[PM-3222] Migration of data from LiteDB to shared pref storage (#2724 ) * Migration of data from LiteDB to shared pref storage * tweaks	2023-08-30 10:55:20 -04:00
André Bispo	4d0f9d1c03	[PM-3543] [PM-3607] Fix password re-prompt when editing and on autofill. (#2713 ) * [PM-3543] [PM-3507] Fix password re-prompt when editing and on autofill.	2023-08-30 09:38:46 +01:00
André Bispo	68759fc608	[PM-3547] Change logic to set user key for inactive account (#2715 )	2023-08-29 10:28:51 +01:00
github-actions[bot]	47be3d6aef	Bumped version to 2023.8.1 (#2730 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-08-28 16:34:38 -04:00
github-actions[bot]	7ec5c8ccfd	Bumped version to 2023.8.0 (#2725 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-08-25 19:52:35 -04:00
Jake Fink	819aabb330	don't clear key needed for bio/auto migration in pin migration (#2721 )	2023-08-25 09:47:37 -04:00
github-actions[bot]	9c7ff853d7	Autosync the updated translations (#2720 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-08-25 09:03:57 +00:00
mpbw2	e30f9903d1	fix for TDE pref naming collision (#2712 ) * fix for TDE pref naming collision * fix case	2023-08-22 15:51:11 -04:00
André Bispo	249406e3a8	[PM-3545] Fix biometric unlock for autofill (#2710 ) * [PM-3545] Fix biometric unlock for autofill * [PM-3545] Reuse existing method	2023-08-21 20:30:22 +01:00
github-actions[bot]	8cae840c68	Autosync the updated translations (#2704 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-08-19 14:00:16 +00:00
André Bispo	e274c04107	[PM-3513] Show error SSO policy (#2707 ) * [PM-3513] Show API error when SSO policy is enforced.	2023-08-18 23:05:52 +01:00
Robyn MacCallum	7043be67dd	Update CODEOWNERS (#2701 ) * Update CODEOWNERS * Update CODEOWNERS	2023-08-18 11:20:26 -04:00
Federico Maccaroni	afb8c515d6	[PM-3071] Remove share on save toggle on Send view (#2659 ) * PM-3071 Removed share on save toggle on Send view and now it's done automatically, same for copy after saving from the Share extension * PM-3071 Fix alignments on Share extension send view	2023-08-17 16:42:08 -03:00
Todd Martin	bfcfd367dd	Trusted Device Encryption feature (#2656 ) * [PM-1208] Add Device approval options screen. View model waiting for additional logic to be added. * [PM-1208] Add device related api endpoint. Add AccoundDecryptOptions model and property to user Account. * [PM-1208] Add continue button and not you option * [PM-1379] add DeviceTrustCryptoService with establish trust logic (#2535) * [PM-1379] add DeviceCryptoService with establish trust logic * PM-1379 update api location and other minor refactors * pm-1379 fix encoding * update trusted device keys api call to Put * [PM-1379] rename DeviceCryptoService to DeviceTrustCryptoService - refactors to prevent side effects * [PM-1379] rearrange methods in DeviceTrustCryptoService * [PM-1379] rearrange methods in abstraction * [PM-1379] deconstruct tuples * [PM-1379] remove extra tasks * [PM-2583] Answer auth request with mp field as null if doesn't have it. (#2609) * [PM-2287][PM-2289][PM-2293] Approval Options (#2608) * [PM-2293] Add AuthRequestType to PasswordlessLoginPage. * [PM-2293] Add Actions to ApproveWithDevicePage * [PM-2293] Change screen text based on AuthRequestType * [PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions. * [PM-2293] Change boolean variable expression. * [PM-2293] Trust device after admin request login. * code format * [PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page. * [PM-2293] Fix state variable get set. * [PM-2287][PM-2289][PM-2293] Rename method * [PM-1201] Change timeout actions available based on hasMasterPassword (#2610) * [PM-1201] Change timeout actions available based on hasMasterPassword * [PM-2731] add user key and master key types * [PM-2713] add new state for new keys and obsolete old ones - UserKey - MasterKey - UserKeyMasterKey (enc UserKey from User Table) * [PM-271] add UserKey and MasterKey support to crypto service * [PM-2713] rename key hash to password hash & begin add methods to crypto service * [PM-2713] continue organizing crypto service * [PM-2713] more updates to crypto service * [PM-2713] add new pin methods to state service * [PM-2713] fix signature of GetUserKeyPin * [PM-2713] add make user key method to crypto service * [PM-2713] refresh pin key when setting user key * [PM-2713] use new MakeMasterKey method * [PM-2713] add toggle method to crypto service for keys * [PM-2713] converting calls to new crypto service api * [PM-2713] add migration for pin on lock screens * [PM-2713] more conversions to new crypto service api * [PM-2713] convert cipher service and others to crypto service api * [PM-2713] More conversions to crypto api * [PM-2713] use new crypto service api in auth service * [PM-2713] remove unused cached values in crypto service * [PM-2713] set decrypt and set user key in login helper * fix bad merge * Update crypto service api call to fix build * [PM-1208] Fix app resource file * [PM-1208] Fix merge * [PM-1208] Fix merge * [PM-2713] optimize async code in crypto service * [PM-2713] rename password hash to master key hash * [PM-2713] fix casting issues and pin * [PM-2713] remove extra comment * [PM-2713] remove broken casting * [PM-2297] Login with trusted device (Flow 2) (#2623) * [PM-2297] Add DecryptUserKeyWithDeviceKey method * [PM-2297] Add methods to DeviceTrustCryptoService update decryption options model * [PM-2297] Update account decryption options model * [PM-2297] Fix TrustedDeviceOption and DeviceResponse model. Change StateService device key get set to have default user id * [PM-2297] Update navigation to decryption options * [PM-2297] Add missing action navigations to iOS extensions * [PM-2297] Fix trust device bug/typo * [PM-2297] Fix model bug * [PM-2297] Fix state var crash * [PM-2297] Add trust device login logic to auth service * [PM-2297] Refactor auth service key connector code * [PM-2297] Remove reconciledOptions for deviceKey in state service * [PM-2297] Remove unnecessary user id params * [PM-2289] [PM-2293] TDE Login with device Admin Request (#2642) * [PM-2713] deconstruct new key pair * [PM-2713] rename PrivateKey methods to UserPrivateKey on crypto service * [PM-2713] rename PinLockEnum to PinLockType * [PM-2713] don't pass user key as param when encrypting * [PM-2713] rename toggle method, don't reset enc user key * [PM-2713] pr feedback * [PM-2713] PR feedback * [PM-2713] rename get pin lock type method * [PM-2713] revert feedback for build * [PM-2713] rename state methods * [PM-2713] combine makeDataEncKey methods * [PM-2713] consolidate attachment key creation - also fix ios files missed during symbol rename * [PM-2713] replace generic with inherited class * rename account keys to be more descriptive * [PM-2713] add auto unlock key to mobile * [PM-1208] Add TDE flows for new users (#2655) * [PM-1208] Create new user on SSO. Logout if not password is setup or has pending admin auth request. * [PM-1208] Fix new user UserKey decryption. * [PM-1208] Add new user continue to vault logic. Auto enrol user on continue. * [PM-1208] Trust device only if needed * [PM-1208] Add logic for New User SSO. * [PM-1208] Add logic for New User SSO (missing file). * [PM-2713] set user key on set password page * [PM-2713] set enc user key during kc onboarding * fix formatting * [PM-2713] make method async again - returning null from a task thats not async throws * [PM-2713] clear service cache when adding new account * Fix build after merge * [PM-3313] Fix Android SSO Login (#2663) * [PM-3313] Catch exception on AuthPendingRequest * [PM-3313] Fix lock timeout action if user doesn't have a master password. * code format * [PM-3313] Null email in Approval Options screen (#2664) * [PM-3313] Fix null email in approval options screen * [PM-3320][PM-3321] Fix labels and UI tweaks (#2666) * [PM-3320] Fix UI copy and remember me default ON. * [PM-3321] Fix UI on Log in with device screen. * [PM-3337] Fix admin request deny error (#2669) * [PM-3342] Not you button logs user out. (#2672) * [PM-3319] Check for admin request in Lock page (#2668) * [PM-3319] Ignore admin auth request when choosing mp as decryption option. * [PM-2289] Change header title based on auth request type (#2670) * [PM-2289] Change header title based on auth request type * [PM-3333] Check for purged admin auth requests (#2671) * [PM-3333] Check for purged admin auth requests Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3341] Vault Timeout Action not persisted correctly (#2673) * [PM-3341] Fix timeout action change when navigating * [PM-3357] Fix copy for Login Initiated (#2674) * [PM-3362] Fix auth request approval (#2675) * [PM-3362] Fix auth request approval * [PM-3362] Add new exception type * [PM-3102] Update Master password reprompt to be based on MP instead of Key Connector (#2653) * PM-3102 Added check to see if a user has master password set replacing previous usage of key connector. * PM-3102 Fix formatting * [PM-2713] Final merge from Key Migration branch to TDE Feature branch (#2667) * [PM-2713] add async to key connector service methods * [PM-2713] rename ephemeral pin key * add state for biometric key and accept UserKey instead of string for auto key * Get UserKey from bio state on unlock * PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called * renaming bio key and fix build * PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet * revert removal of key connector service from auth service * PM-2713 set user key when using KC * clear enc user key after migration * use is true for nullable bool * PR feedback, refactor kc service --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * Fix app fresh install user login with master password. (#2676) * [PM-3303] Fix biometric login after key migration (#2679) * [PM-3303] Add condition to biometric unlock * [PM-3381] Fix TDE login 2FA flow (#2678) * [PM-3381] Check for vault lock on 2FA screen * [PM-3381] Move logic to ViewModel * [PM-3381] Fix null vm error * [PM-3379] Fix key rotation on trusted device. (#2680) * [PM-3381] Update login flows (#2683) * [PM-3381] Update login flows * [PM-3381] Remove _authingWithSso parameter * PM-3385 Fix MP reprompt item level when no MP hash is stored like logging in with TDE. Also refactor code to be more maintainable (#2687) * PM-3386 Fix MP reprompt / OTP decision to be also based on the master key hash. (#2688) * PM-3450 Fix has master password with mp key hash check (#2689) * [PM-3394] Fix login with device for passwordless approvals (#2686) * set activeUserId to null when logging in a new account - Also stop the user key from being set in inactive accounts * get token for login with device if approving device doesn't have master key * add comment * simplify logic * check for route instead of using isAuthenticated - we don't clear the user id when logging in new account - this means we can't trust the state service, so we have to base our logic off the route in login with device * use authenticated auth request for tde login with device * [PM-3394] Add authingWithSso parameter to LoginPasswordlessRequestPage. * pr feedback * [PM-3394] Refactor condition Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: André Bispo <abispo@bitwarden.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3462] Handle force password reset on mobile with TDE (#2694) * [PM-3462] Handle force password reset on mobile with TDE * [PM-3462] update references to refactored crypto method - fix kc bug, we were sending private key instead of user key to server - rename kc service method to be correct * [PM-3462] Update TwoFactorPage login logic * [PM-3462] Added pending admin request check to TwoFactorPage * [PM-3462] Added new exception types for null keys --------- Co-authored-by: André Bispo <abispo@bitwarden.com> * [PM-1029] Fix Async suffix in ApiService. Add UserKeyNullExceptions. * [PM 3513] Fix passwordless 2fa login with device on mobile (#2700) * [PM-3513] Fix 2FA for normal login with device with users without mp * move _userKey --------- Co-authored-by: André Bispo <abispo@bitwarden.com> * clear encrypted pin on logout (#2699) --------- Co-authored-by: André Bispo <abispo@bitwarden.com> Co-authored-by: Jake Fink <jfink@bitwarden.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>	2023-08-17 15:19:35 -04:00
Federico Maccaroni	a23454bc53	[PM-3508] Fix Release iPhoneSimulator configuration for iOS / Extensions (#2698 ) * PM-3508 Fix Release iPhoneSimulator configuration for iOS / Extensions * PM-3508 Fix --deep space on watch app references	2023-08-16 15:55:34 -03:00
mpbw2	6f7100ae4f	lib updates (#2696 )	2023-08-16 12:48:54 -04:00
ifernandezdiaz	01ac20e6e4	Adding missing AutomationIDs on LoginPasswordlessRequestListPage (#2693 )	2023-08-16 11:09:07 -03:00
github-actions[bot]	8474f536ff	Autosync the updated translations (#2677 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>	2023-08-15 13:48:01 +00:00
Daniel James Smith	f426c0e370	Create section for crowdin sync (#2692 )	2023-08-15 15:47:08 +02:00
Daniel James Smith	420dc09fd1	Update codeowners (#2691 ) * Set team-leads-eng as owners for translations This is needed to Crowdin sync PRs can be merged. * Add team-tools as owner of the email-forwarders * Fix unescaped whitespace * Remove team-leads-eng from owning English resources	2023-08-15 15:32:57 +02:00
Federico Maccaroni	6d4793d592	[PM-1768] Set up CODEOWNERS file (#2464 ) * PM-1768 Add CODEOWNERS file with some initial setup of folders that don't need to be moved and can have their owners assigned already. * Update CODEOWNERS Removed entire projects owners cause I didn't consider auth inside of the extensions.	2023-08-10 13:58:03 -03:00
Bernd Schoolmann	eea7c6b7d7	[PM-2901] Synchronize sends on send creation/update/deletion notification (#2606 ) * Add sync on send create/update/delete notification * Update send notifications to only sync sends * Fix incorrect notification type in PushNotificationListenerService Co-authored-by: aj-rosado <109146700+aj-rosado@users.noreply.github.com> * Invert if to improve readability * Simplify shouldUpdate logic in SyncUpsertSendAsync * Further simplify SyncService code * Fix if condition in SyncService Co-authored-by: aj-rosado <109146700+aj-rosado@users.noreply.github.com> * Fixed whitespace formatting --------- Co-authored-by: aj-rosado <109146700+aj-rosado@users.noreply.github.com> Co-authored-by: Andre Rosado <arosado@bitwarden.com>	2023-08-08 14:59:42 +01:00
Bernd Schoolmann	ec93a61275	[PM-3092] Clarify argon2 ios autofill warning (#2630 ) * Clarify argon2 ios warning * Update Argon2 insufficient memory warning message	2023-08-07 10:41:40 -04:00
Federico Maccaroni	c34d1da6e6	PM-3298 Updated region selector to be logging in on and also its options (#2657 )	2023-08-04 11:44:39 -03:00
github-actions[bot]	c4e64e082b	Autosync the updated translations (#2660 ) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>	2023-08-04 10:55:27 +00:00
Federico Maccaroni	5aaff1ea20	PM-3249 Removed back button from block autofill uris to be aligned to other views (#2654 )	2023-08-02 10:54:01 -03:00